From b2a5e96cf763d91fcebad322c64b2df8bab49b48 Mon Sep 17 00:00:00 2001 From: donncha Date: Fri, 23 Nov 2007 12:22:07 +0000 Subject: Use MUPLUGINDIR, props chmac, fixes #508 git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1164 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-admin/admin.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'wp-admin/admin.php') diff --git a/wp-admin/admin.php b/wp-admin/admin.php index ee5f9a9..610544d 100644 --- a/wp-admin/admin.php +++ b/wp-admin/admin.php @@ -58,7 +58,7 @@ if (isset($plugin_page)) { wp_die(__('Invalid plugin page')); } - if (! file_exists(ABSPATH . PLUGINDIR . "/$plugin_page") && ! file_exists(ABSPATH . "wp-content/mu-plugins/$plugin_page")) + if (! file_exists(ABSPATH . PLUGINDIR . "/$plugin_page") && ! file_exists(ABSPATH . MUPLUGINDIR . "/$plugin_page")) wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page))); do_action('load-' . $plugin_page); @@ -66,8 +66,8 @@ if (isset($plugin_page)) { if (! isset($_GET['noheader'])) require_once(ABSPATH . '/wp-admin/admin-header.php'); - if ( file_exists(ABSPATH . "wp-content/mu-plugins/$plugin_page") ) - include(ABSPATH . "wp-content/mu-plugins/$plugin_page"); + if ( file_exists(ABSPATH . MUPLUGINDIR . "/$plugin_page") ) + include(ABSPATH . MUPLUGINDIR . "/$plugin_page"); else include(ABSPATH . PLUGINDIR . "/$plugin_page"); } -- cgit