Changeset 14970

Timestamp:

05/27/2010 02:03:06 AM (15 years ago)

Author:

nacin

Message:

Nicer message for an uninstalled/invalid importer. see #13566.

Location:

trunk/wp-admin

Files:

• admin.php (modified) (1 diff)
• import.php (modified) (1 diff)

trunk/wp-admin/admin.php

@@ -161 +161 @@
         wp_die(__('You are not allowed to import.'));
 
-    if ( validate_file($importer) ) {
-        wp_die(__('Invalid importer.'));
-    }
+    if ( validate_file($importer) )
+        wp_redirect( admin_url( 'import.php?invalid=' . $importer ) );
 
     // Allow plugins to define importers as well
     if ( !isset($wp_importers) || !isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2])) {
         if (! file_exists(ABSPATH . "wp-admin/import/$importer.php"))
-            wp_die(__('Cannot load importer.'));
+            wp_redirect( admin_url( 'import.php?invalid=' . $importer ) );
         include(ABSPATH . "wp-admin/import/$importer.php");
     }

trunk/wp-admin/import.php

@@ -32 +32 @@
 <?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); ?></h2>
+<?php if ( ! empty( $_GET['invalid'] ) ) : ?>
+    <div class="error"><p><strong><?php _e('ERROR:')?></strong> <?php printf( __('The <strong>%s</strong> importer is invalid or is not installed.'), esc_html( $_GET['invalid'] ) ); ?></p></div>
+<?php endif; ?>
 <p><?php _e('If you have posts or comments in another system, WordPress can import those into this site. To get started, choose a system to import from below:'); ?></p>