Changeset 14866 for trunk/wp-includes/ms-functions.php

Timestamp:

05/25/2010 12:13:03 AM (16 years ago)

Author:

wpmuguru

Message:

eliminate warning in global_terms(), global to static, fixes #13517

Location:

trunk/wp-includes

Files:

• . (modified) (1 prop)
• ms-functions.php (modified) (3 diffs)

trunk/wp-includes/ms-functions.php

@@ -1210 +1210 @@
  */
 function global_terms( $term_id, $deprecated = '' ) {
-    global $wpdb, $global_terms_recurse;
+    global $wpdb;
+    static $global_terms_recurse;
 
     if ( !global_terms_enabled() )
@@ -1216 +1217 @@
 
     // prevent a race condition
+    $recurse_start = false;
     if ( !isset( $global_terms_recurse ) ) {
         $recurse_start = true;
@@ -1221 +1223 @@
     } elseif ( 10 < $global_terms_recurse++ ) {
         return $term_id;
-        $recurse_start = false;
     }