Changeset 13701

Timestamp:

03/14/2010 12:12:23 PM (17 years ago)

Author:

dd32

Message:

Restore backwards compatibility of integer sidebars("sidebar-$i"). See #12606

File:

• trunk/wp-includes/widgets.php (modified) (2 diffs)

trunk/wp-includes/widgets.php

@@ -482 +482 @@
                 parse_str($args, $args);
 
-        $n = count($wp_registered_sidebars);
         for ( $i = 1; $i <= $number; $i++ ) {
                 $_args = $args;
@@ -492 +491 @@
 
                 // Custom specified ID's are suffixed if they exist already.
-                // Automatically generated sidebar names need to be suffixed regardless.
+                // Automatically generated sidebar names need to be suffixed regardless starting at -0
                 if ( isset($args['id']) ) {
                         $_args['id'] = $args['id'];
+                        $n = 2; // Start at -2 for conflicting custom ID's
                         while ( isset($wp_registered_sidebars[$_args['id']]) )
                                 $_args['id'] = $args['id'] . '-' . $n++;
                 } else {
+                        $n = count($wp_registered_sidebars);
                         do {
-                                $_args['id'] = 'sidebar-' . $n++;
+                                $_args['id'] = 'sidebar-' . ++$n;
                         } while ( isset($wp_registered_sidebars[$_args['id']]) );
                 }