Changeset 18640 for trunk/wp-admin/admin.php

Timestamp:

09/05/2011 07:18:36 PM (14 years ago)

Author:

duck_

Message:

Pull out old import remnant from when importers were shipped in core. Fixes #15844.

File:

• trunk/wp-admin/admin.php (modified) (2 diffs)

trunk/wp-admin/admin.php

@@ -184 +184 @@
     }
 
-    // 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_redirect( admin_url( 'import.php?invalid=' . $importer ) );
-            exit;
-        }
-        include(ABSPATH . "wp-admin/import/$importer.php");
+    if ( ! isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2]) ) {
+        wp_redirect( admin_url( 'import.php?invalid=' . $importer ) );
+        exit;
     }
 
@@ -212 +208 @@
 
     // Make sure rules are flushed
-    global $wp_rewrite;
-    $wp_rewrite->flush_rules(false);
+    flush_rewrite_rules(false);
 
     exit();