<!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>[13699] trunk/wp-includes/widgets.php: Simplify the Id uniqueness loops.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13699">13699</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-03-14 11:34:51 +0000 (Sun, 14 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify the Id uniqueness loops. Guard against more use-cases which might cause ID conflicts. See <a href="http://trac.wordpress.org/ticket/12606">#12606</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludeswidgetsphp">trunk/wp-includes/widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludeswidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/widgets.php (13698 => 13699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/widgets.php 2010-03-14 10:55:17 UTC (rev 13698)
+++ trunk/wp-includes/widgets.php 2010-03-14 11:34:51 UTC (rev 13699)
</span><span class="lines">@@ -489,18 +489,13 @@
</span><span class="cx"> else
</span><span class="cx"> $_args['name'] = isset($args['name']) ? $args['name'] : __('Sidebar');
</span><span class="cx">
</span><del>- if ( isset($args['id']) ) {
- $_args['id'] = $args['id'];
- if ( $number > 1 ) // Ensure that for multiple additions, the ID is unique (even if specified). Append -xx for > 1 sidebars.
- $_args['id'] .= '-' . $i;
- } else {
- $n = count($wp_registered_sidebars);
- do {
- $n++;
- $_args['id'] = "sidebar-$n";
- } while ( isset($wp_registered_sidebars[$_args['id']]) );
- }
</del><ins>+ $id = isset($args['id']) ? $args['id'] : 'sidebar';
+ $_args['id'] = $id;
</ins><span class="cx">
</span><ins>+ $n = count($wp_registered_sidebars);
+ while ( isset($wp_registered_sidebars[$_args['id']]) )
+ $_args['id'] = $id . '-' . $n++;
+
</ins><span class="cx"> register_sidebar($_args);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>