summaryrefslogtreecommitdiffstats
path: root/wp-inst/wp-admin/admin.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-09-12 09:56:20 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-09-12 09:56:20 +0000
commit08c5d92c5e2b3f41b2067a4f18a878eb7a6d461d (patch)
treea1bfc6794fd6391ab18cde2be9ab7d5fdb53a8f4 /wp-inst/wp-admin/admin.php
parentaa61097b2b86ec542ce29cc169f7686f555fb79c (diff)
downloadwordpress-mu-08c5d92c5e2b3f41b2067a4f18a878eb7a6d461d.tar.gz
wordpress-mu-08c5d92c5e2b3f41b2067a4f18a878eb7a6d461d.tar.xz
wordpress-mu-08c5d92c5e2b3f41b2067a4f18a878eb7a6d461d.zip
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@310 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/wp-admin/admin.php')
-rw-r--r--wp-inst/wp-admin/admin.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/wp-inst/wp-admin/admin.php b/wp-inst/wp-admin/admin.php
index 289c8a3..2a65c30 100644
--- a/wp-inst/wp-admin/admin.php
+++ b/wp-inst/wp-admin/admin.php
@@ -74,7 +74,7 @@ if (isset($_GET['page'])) {
if (! file_exists(ABSPATH . "wp-admin/import/$importer.php"))
die(__('Cannot load importer.'));
-
+
include(ABSPATH . "wp-admin/import/$importer.php");
$parent_file = 'import.php';
@@ -85,6 +85,8 @@ if (isset($_GET['page'])) {
require_once(ABSPATH . 'wp-admin/upgrade-functions.php');
+ define('WP_IMPORTING', true);
+
call_user_func($wp_importers[$importer][2]);
include(ABSPATH . 'wp-admin/admin-footer.php');