eliminate warning in global_terms(), global to static, fixes #13517
git-svn-id: http://svn.automattic.com/wordpress/trunk@14866 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
1ec3c835d8
commit
a4e59b62eb
wp-includes
|
@ -1209,18 +1209,19 @@ function fix_import_form_size( $size ) {
|
||||||
* @return int An ID from the global terms table mapped from $term_id.
|
* @return int An ID from the global terms table mapped from $term_id.
|
||||||
*/
|
*/
|
||||||
function global_terms( $term_id, $deprecated = '' ) {
|
function global_terms( $term_id, $deprecated = '' ) {
|
||||||
global $wpdb, $global_terms_recurse;
|
global $wpdb;
|
||||||
|
static $global_terms_recurse;
|
||||||
|
|
||||||
if ( !global_terms_enabled() )
|
if ( !global_terms_enabled() )
|
||||||
return $term_id;
|
return $term_id;
|
||||||
|
|
||||||
// prevent a race condition
|
// prevent a race condition
|
||||||
|
$recurse_start = false;
|
||||||
if ( !isset( $global_terms_recurse ) ) {
|
if ( !isset( $global_terms_recurse ) ) {
|
||||||
$recurse_start = true;
|
$recurse_start = true;
|
||||||
$global_terms_recurse = 1;
|
$global_terms_recurse = 1;
|
||||||
} elseif ( 10 < $global_terms_recurse++ ) {
|
} elseif ( 10 < $global_terms_recurse++ ) {
|
||||||
return $term_id;
|
return $term_id;
|
||||||
$recurse_start = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$term_id = intval( $term_id );
|
$term_id = intval( $term_id );
|
||||||
|
|
Loading…
Reference in New Issue