<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[14866] trunk/wp-includes: eliminate warning in global_terms(),
global to static, fixes #13517</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14866">14866</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-05-25 00:13:03 +0000 (Tue, 25 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>eliminate warning in global_terms(), global to static, fixes <a href="http://trac.wordpress.org/ticket/13517">#13517</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkwpincludes">trunk/wp-includes/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludes"></a>
<div class="propset"><h4>Property changes: trunk/wp-includes</h4>
<pre class="diff"><span>
<span class="cx">Name: svn:ignore
</span><span class="cx"> + .functions.php.swp
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (14865 => 14866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-05-24 23:00:54 UTC (rev 14865)
+++ trunk/wp-includes/ms-functions.php 2010-05-25 00:13:03 UTC (rev 14866)
</span><span class="lines">@@ -1209,18 +1209,19 @@
</span><span class="cx"> * @return int An ID from the global terms table mapped from $term_id.
</span><span class="cx"> */
</span><span class="cx"> function global_terms( $term_id, $deprecated = '' ) {
</span><del>- global $wpdb, $global_terms_recurse;
</del><ins>+ global $wpdb;
+ static $global_terms_recurse;
</ins><span class="cx">
</span><span class="cx"> if ( !global_terms_enabled() )
</span><span class="cx"> return $term_id;
</span><span class="cx">
</span><span class="cx"> // prevent a race condition
</span><ins>+ $recurse_start = false;
</ins><span class="cx"> if ( !isset( $global_terms_recurse ) ) {
</span><span class="cx"> $recurse_start = true;
</span><span class="cx"> $global_terms_recurse = 1;
</span><span class="cx"> } elseif ( 10 < $global_terms_recurse++ ) {
</span><span class="cx"> return $term_id;
</span><del>- $recurse_start = false;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $term_id = intval( $term_id );
</span></span></pre>
</div>
</div>
</body>
</html>