Unset once we have included all the plugins to keep things tidy. Fixes #6308 props DD32.

git-svn-id: http://svn.automattic.com/wordpress/trunk@10624 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2009-02-22 08:30:12 +00:00
parent a9e8073b30
commit 9f1a7e4992

View File

@ -462,18 +462,19 @@ if ( !defined( 'AUTOSAVE_INTERVAL' ) )
require (ABSPATH . WPINC . '/vars.php'); require (ABSPATH . WPINC . '/vars.php');
// Check for hacks file if the option is enabled // Check for hacks file if the option is enabled
if (get_option('hack_file')) { if ( get_option('hack_file') ) {
if (file_exists(ABSPATH . 'my-hacks.php')) if ( file_exists(ABSPATH . 'my-hacks.php') )
require(ABSPATH . 'my-hacks.php'); require(ABSPATH . 'my-hacks.php');
} }
if ( get_option('active_plugins') && !defined('WP_INSTALLING') ) { if ( get_option('active_plugins') && !defined('WP_INSTALLING') ) {
$current_plugins = get_option('active_plugins'); $current_plugins = get_option('active_plugins');
if ( is_array($current_plugins) ) { if ( is_array($current_plugins) ) {
foreach ($current_plugins as $plugin) { foreach ( $current_plugins as $plugin ) {
if ( '' != $plugin && 0 == validate_file($plugin) && file_exists(WP_PLUGIN_DIR . '/' . $plugin) ) if ( '' != $plugin && 0 == validate_file($plugin) && file_exists(WP_PLUGIN_DIR . '/' . $plugin) )
include_once(WP_PLUGIN_DIR . '/' . $plugin); include_once(WP_PLUGIN_DIR . '/' . $plugin);
} }
unset($plugin);
} }
} }