From 28781ebb081ab8d99b30a33f5cd911b3b050bcc9 Mon Sep 17 00:00:00 2001 From: donncha Date: Tue, 26 Sep 2006 15:45:20 +0000 Subject: WP Merge to rev 4254 git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@770 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-admin/admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'wp-admin/admin.php') diff --git a/wp-admin/admin.php b/wp-admin/admin.php index 655ebf1..d5226b4 100644 --- a/wp-admin/admin.php +++ b/wp-admin/admin.php @@ -60,7 +60,7 @@ if (isset($plugin_page)) { wp_die(__('Invalid plugin page')); } - if (! file_exists(ABSPATH . "wp-content/plugins/$plugin_page") && ! file_exists(ABSPATH . "wp-content/mu-plugins/$plugin_page")) + if (! file_exists(ABSPATH . PLUGINDIR . "/$plugin_page") && ! file_exists(ABSPATH . "wp-content/mu-plugins/$plugin_page")) wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page))); do_action('load-' . $plugin_page); @@ -71,7 +71,7 @@ if (isset($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 . PLUGINDIR . "/$plugin_page"); } include(ABSPATH . 'wp-admin/admin-footer.php'); -- cgit