diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-02-14 16:56:46 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-02-14 16:56:46 +0000 |
| commit | 6a5b25251eb16dc8da58816eb41e806197fe8a43 (patch) | |
| tree | 714721e87986d7a254175b4a70f76a3a591e0ffb /wp-inst/wp-admin/admin.php | |
| parent | 39854b3d3a80e4ac2bfee92a4b1210852baa7091 (diff) | |
| download | wordpress-mu-6a5b25251eb16dc8da58816eb41e806197fe8a43.tar.gz wordpress-mu-6a5b25251eb16dc8da58816eb41e806197fe8a43.tar.xz wordpress-mu-6a5b25251eb16dc8da58816eb41e806197fe8a43.zip | |
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@525 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/wp-admin/admin.php')
| -rw-r--r-- | wp-inst/wp-admin/admin.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/wp-inst/wp-admin/admin.php b/wp-inst/wp-admin/admin.php index ab53b4c..37894ca 100644 --- a/wp-inst/wp-admin/admin.php +++ b/wp-inst/wp-admin/admin.php @@ -5,8 +5,8 @@ else require_once('../wp-config.php'); if ( get_option('db_version') != $wp_db_version ) - die (sprintf(__("Your database is out-of-date. Please <a href='%s'>upgrade</a>."), get_option('siteurl') . '/wp-admin/upgrade.php')); - + $out = @file( get_option( "siteurl" ) . "/wp-admin/upgrade.php?step=1" ); // upgrade the db! + require_once(ABSPATH . 'wp-admin/admin-functions.php'); require_once(ABSPATH . 'wp-admin/admin-db.php'); require_once(ABSPATH . WPINC . '/registration-functions.php'); @@ -60,13 +60,16 @@ if (isset($_GET['page'])) { die(__('Invalid plugin page')); } - if (! file_exists(ABSPATH . "wp-content/plugins/$plugin_page")) + if (! file_exists(ABSPATH . "wp-content/plugins/$plugin_page") && ! file_exists(ABSPATH . "wp-content/mu-plugins/$plugin_page")) die(sprintf(__('Cannot load %s.'), $plugin_page)); if (! isset($_GET['noheader'])) require_once(ABSPATH . '/wp-admin/admin-header.php'); - include(ABSPATH . "wp-content/plugins/$plugin_page"); + if ( file_exists(ABSPATH . "wp-content/mu-plugins/$plugin_page") ) + include(ABSPATH . "wp-content/mu-plugins/$plugin_page"); + else + include(ABSPATH . "wp-content/plugins/$plugin_page"); } include(ABSPATH . 'wp-admin/admin-footer.php'); |