<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[11824] trunk: Fix warning in wp-admin/widgets.
php when using Accessibility Mode on brand new install, fixes #10610</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/11824">11824</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2009-08-16 01:56:21 +0000 (Sun, 16 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix warning in wp-admin/widgets.php when using Accessibility Mode on brand new install, fixes <a href="http://trac.wordpress.org/ticket/10610">#10610</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminwidgetsphp">trunk/wp-admin/widgets.php</a></li>
<li><a href="#trunkwpincludeswidgetsphp">trunk/wp-includes/widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/widgets.php (11823 => 11824)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/widgets.php 2009-08-15 12:01:04 UTC (rev 11823)
+++ trunk/wp-admin/widgets.php 2009-08-16 01:56:21 UTC (rev 11824)
</span><span class="lines">@@ -252,13 +252,15 @@
</span><span class="cx"> <p class="describe"><?php _e('Select both the sidebar for this widget and the position of the widget in that sidebar.'); ?></p>
</span><span class="cx"> <div class="widget-position">
</span><span class="cx"> <table class="widefat"><thead><tr><th><?php _e('Sidebar'); ?></th><th><?php _e('Position'); ?></th></tr></thead><tbody>
</span><del>-<?php foreach ( $wp_registered_sidebars as $sbname => $sbvalue ) {
</del><ins>+<?php
+ foreach ( $wp_registered_sidebars as $sbname => $sbvalue ) {
</ins><span class="cx"> echo "\t\t<tr><td><label><input type='radio' name='sidebar' value='" . esc_attr($sbname) . "'" . checked( $sbname, $sidebar, false ) . " /> $sbvalue[name]</label></td><td>";
</span><span class="cx"> if ( 'wp_inactive_widgets' == $sbname ) {
</span><span class="cx"> echo '&nbsp;';
</span><span class="cx"> } else {
</span><span class="cx"> if ( !isset($sidebars_widgets[$sbname]) || !is_array($sidebars_widgets[$sbname]) ) {
</span><span class="cx"> $j = 1;
</span><ins>+ $sidebars_widgets[$sbname] = array();
</ins><span class="cx"> } else {
</span><span class="cx"> $j = count($sidebars_widgets[$sbname]);
</span><span class="cx"> if ( isset($_GET['addnew']) || !in_array($widget_id, $sidebars_widgets[$sbname], true) )
</span></span></pre></div>
<a id="trunkwpincludeswidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/widgets.php (11823 => 11824)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/widgets.php 2009-08-15 12:01:04 UTC (rev 11823)
+++ trunk/wp-includes/widgets.php 2009-08-16 01:56:21 UTC (rev 11824)
</span><span class="lines">@@ -970,7 +970,7 @@
</span><span class="cx"> $sidebars_widgets = get_option('sidebars_widgets', array());
</span><span class="cx"> $_sidebars_widgets = array();
</span><span class="cx">
</span><del>- if ( isset($sidebars_widgets['wp_inactive_widgets']) )
</del><ins>+ if ( isset($sidebars_widgets['wp_inactive_widgets']) || empty($sidebars_widgets) )
</ins><span class="cx"> $sidebars_widgets['array_version'] = 3;
</span><span class="cx"> elseif ( !isset($sidebars_widgets['array_version']) )
</span><span class="cx"> $sidebars_widgets['array_version'] = 1;
</span></span></pre>
</div>
</div>
</body>
</html>