<!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>[14154] trunk/wp-includes/widgets.php:
Use wp_parse_args in register_sidebar.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14154">14154</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-04-18 15:32:39 +0000 (Sun, 18 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use wp_parse_args in register_sidebar. fixes <a href="http://trac.wordpress.org/ticket/11836">#11836</a>, props scribu.</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 (14153 => 14154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/widgets.php 2010-04-18 14:51:55 UTC (rev 14153)
+++ trunk/wp-includes/widgets.php 2010-04-18 15:32:39 UTC (rev 14154)
</span><span class="lines">@@ -534,8 +534,6 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.2.0
</span><span class="cx"> * @uses $wp_registered_sidebars Stores the new sidebar in this array by sidebar ID.
</span><del>- * @uses parse_str() Converts a string to an array to be used in the rest of the function.
- * @usedby register_sidebars()
</del><span class="cx"> *
</span><span class="cx"> * @param string|array $args Builds Sidebar based off of 'name' and 'id' values
</span><span class="cx"> * @return string The sidebar id that was added.
</span><span class="lines">@@ -543,9 +541,6 @@
</span><span class="cx"> function register_sidebar($args = array()) {
</span><span class="cx"> global $wp_registered_sidebars;
</span><span class="cx">
</span><del>- if ( is_string($args) )
- parse_str($args, $args);
-
</del><span class="cx"> $i = count($wp_registered_sidebars) + 1;
</span><span class="cx">
</span><span class="cx"> $defaults = array(
</span><span class="lines">@@ -558,7 +553,7 @@
</span><span class="cx"> 'after_title' => "</h2>\n",
</span><span class="cx"> );
</span><span class="cx">
</span><del>- $sidebar = array_merge($defaults, (array) $args);
</del><ins>+ $sidebar = wp_parse_args( $args, $defaults );
</ins><span class="cx">
</span><span class="cx"> $wp_registered_sidebars[$sidebar['id']] = $sidebar;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>