From 569642dd32e839a7fbc6939270e7b2580b5d7df8 Mon Sep 17 00:00:00 2001 From: wpmuguru Date: Tue, 25 May 2010 00:31:07 +0000 Subject: [PATCH] give static var initial value, fixes #13517 git-svn-id: http://svn.automattic.com/wordpress/trunk@14867 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/ms-functions.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php index 4eff2ae90..d2385e6a6 100644 --- a/wp-includes/ms-functions.php +++ b/wp-includes/ms-functions.php @@ -1210,14 +1210,14 @@ function fix_import_form_size( $size ) { */ function global_terms( $term_id, $deprecated = '' ) { global $wpdb; - static $global_terms_recurse; + static $global_terms_recurse = null; if ( !global_terms_enabled() ) return $term_id; // prevent a race condition $recurse_start = false; - if ( !isset( $global_terms_recurse ) ) { + if ( $global_terms_recurse === null ) { $recurse_start = true; $global_terms_recurse = 1; } elseif ( 10 < $global_terms_recurse++ ) { @@ -1258,7 +1258,7 @@ function global_terms( $term_id, $deprecated = '' ) { clean_term_cache($term_id); } if( $recurse_start ) - unset( $global_terms_recurse ); + $global_terms_recurse = null; return $global_id; }