Changeset 11824

Timestamp:

08/16/2009 01:56:21 AM (15 years ago)

Author:

azaozz

Message:

Fix warning in wp-admin/widgets.php when using Accessibility Mode on brand new install, fixes #10610

Location:

trunk

Files:

• wp-admin/widgets.php (modified) (2 diffs)
• wp-includes/widgets.php (modified) (1 diff)

trunk/wp-admin/widgets.php

@@ -253 +253 @@
     <div class="widget-position">
     <table class="widefat"><thead><tr><th><?php _e('Sidebar'); ?></th><th><?php _e('Position'); ?></th></tr></thead><tbody>
-<?php   foreach ( $wp_registered_sidebars as $sbname => $sbvalue ) {
+<?php
+    foreach ( $wp_registered_sidebars as $sbname => $sbvalue ) {
         echo "\t\t<tr><td><label><input type='radio' name='sidebar' value='" . esc_attr($sbname) . "'" . checked( $sbname, $sidebar, false ) . " /> $sbvalue[name]</label></td><td>";
         if ( 'wp_inactive_widgets' == $sbname ) {
@@ -260 +261 @@
             if ( !isset($sidebars_widgets[$sbname]) || !is_array($sidebars_widgets[$sbname]) ) {
                 $j = 1;
+                $sidebars_widgets[$sbname] = array();
             } else {
                 $j = count($sidebars_widgets[$sbname]);

trunk/wp-includes/widgets.php

@@ -971 +971 @@
         $_sidebars_widgets = array();
 
-        if ( isset($sidebars_widgets['wp_inactive_widgets']) )
+        if ( isset($sidebars_widgets['wp_inactive_widgets']) || empty($sidebars_widgets) )
             $sidebars_widgets['array_version'] = 3;
         elseif ( !isset($sidebars_widgets['array_version']) )