diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-10-12 16:21:15 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-10-12 16:21:15 +0000 |
| commit | 3a4570b0fc8b3d6339bef71d17d7701554e0bbf7 (patch) | |
| tree | 2a06e5261263c68d8afd95a6328879dc289cb909 /wp-admin/admin.php | |
| parent | b83c34a7010faee0223f6037025c350da12e05e6 (diff) | |
| download | wordpress-mu-3a4570b0fc8b3d6339bef71d17d7701554e0bbf7.tar.gz wordpress-mu-3a4570b0fc8b3d6339bef71d17d7701554e0bbf7.tar.xz wordpress-mu-3a4570b0fc8b3d6339bef71d17d7701554e0bbf7.zip | |
Merge with WP 2.3 - testing use only!
Move pluggable functions out of wpmu-functions and into pluggable.php, fixes #439
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1069 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/admin.php')
| -rw-r--r-- | wp-admin/admin.php | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/wp-admin/admin.php b/wp-admin/admin.php index 772b710..ee5f9a9 100644 --- a/wp-admin/admin.php +++ b/wp-admin/admin.php @@ -15,9 +15,7 @@ if ( get_option('db_version') != $wp_db_version ) { } } -require_once(ABSPATH . 'wp-admin/admin-functions.php'); -require_once(ABSPATH . 'wp-admin/admin-db.php'); -require_once(ABSPATH . WPINC . '/registration.php'); +require_once(ABSPATH . 'wp-admin/includes/admin.php'); auth_redirect(); @@ -43,7 +41,7 @@ if (isset($_GET['page'])) { $plugin_page = plugin_basename($plugin_page); } -require(ABSPATH . '/wp-admin/menu.php'); +require(ABSPATH . 'wp-admin/menu.php'); // Handle plugin admin pages. if (isset($plugin_page)) { @@ -52,7 +50,7 @@ if (isset($plugin_page)) { if ( $page_hook ) { do_action('load-' . $page_hook); if (! isset($_GET['noheader'])) - require_once(ABSPATH . '/wp-admin/admin-header.php'); + require_once(ABSPATH . 'wp-admin/admin-header.php'); do_action($page_hook); } else { @@ -88,10 +86,15 @@ if (isset($plugin_page)) { wp_die(__('Invalid importer.')); } - if (! file_exists(ABSPATH . "wp-admin/import/$importer.php")) - wp_die(__('Cannot load importer.')); - - include(ABSPATH . "wp-admin/import/$importer.php"); + // Allow plugins to define importers as well + if (! is_callable($wp_importers[$importer][2])) + { + if (! file_exists(ABSPATH . "wp-admin/import/$importer.php")) + { + wp_die(__('Cannot load importer.')); + } + include(ABSPATH . "wp-admin/import/$importer.php"); + } $parent_file = 'edit.php'; $submenu_file = 'import.php'; @@ -100,7 +103,7 @@ if (isset($plugin_page)) { if (! isset($_GET['noheader'])) require_once(ABSPATH . 'wp-admin/admin-header.php'); - require_once(ABSPATH . 'wp-admin/upgrade-functions.php'); + require_once(ABSPATH . 'wp-admin/includes/upgrade.php'); define('WP_IMPORTING', true); kses_init_filters(); // Always filter imported data with kses. |