From 9f1a7e499288e8760d6756dcd7e3eac9594bdb9f Mon Sep 17 00:00:00 2001 From: westi Date: Sun, 22 Feb 2009 08:30:12 +0000 Subject: [PATCH] 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 --- wp-settings.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/wp-settings.php b/wp-settings.php index b0437be9b..718e973d5 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -462,18 +462,19 @@ if ( !defined( 'AUTOSAVE_INTERVAL' ) ) require (ABSPATH . WPINC . '/vars.php'); // Check for hacks file if the option is enabled -if (get_option('hack_file')) { - if (file_exists(ABSPATH . 'my-hacks.php')) +if ( get_option('hack_file') ) { + if ( file_exists(ABSPATH . 'my-hacks.php') ) require(ABSPATH . 'my-hacks.php'); } if ( get_option('active_plugins') && !defined('WP_INSTALLING') ) { $current_plugins = get_option('active_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) ) include_once(WP_PLUGIN_DIR . '/' . $plugin); } + unset($plugin); } }