summaryrefslogtreecommitdiffstats
path: root/wp-admin/admin.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-09-26 15:45:20 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-09-26 15:45:20 +0000
commit28781ebb081ab8d99b30a33f5cd911b3b050bcc9 (patch)
treef21e6b7d3dd06002c58dd52ae2eae10d64d62d85 /wp-admin/admin.php
parentcbd939114d362bfece3839d7d5d5e07367fd6be8 (diff)
downloadwordpress-mu-28781ebb081ab8d99b30a33f5cd911b3b050bcc9.tar.gz
wordpress-mu-28781ebb081ab8d99b30a33f5cd911b3b050bcc9.tar.xz
wordpress-mu-28781ebb081ab8d99b30a33f5cd911b3b050bcc9.zip
WP Merge to rev 4254
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@770 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/admin.php')
-rw-r--r--wp-admin/admin.php4
1 files changed, 2 insertions, 2 deletions
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');