Changeset 13700

Timestamp:

03/14/2010 11:58:53 AM (17 years ago)

Author:

dd32

Message:

Revert [13699], It breaks dynamic_sidebar(<int>) compatibility. Use a safer loop for clashes. 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;
@@ -490 +491 @@
                         $_args['name'] = isset($args['name']) ? $args['name'] : __('Sidebar');
 
-                $id = isset($args['id']) ? $args['id'] : 'sidebar';
-                $_args['id'] = $id;
-
-                $n = count($wp_registered_sidebars);
-                while ( isset($wp_registered_sidebars[$_args['id']]) )
-                        $_args['id'] = $id . '-' . $n++;
-
+                // Custom specified ID's are suffixed if they exist already.
+                // Automatically generated sidebar names need to be suffixed regardless.
+                if ( isset($args['id']) ) {
+                        $_args['id'] = $args['id'];
+                        while ( isset($wp_registered_sidebars[$_args['id']]) )
+                                $_args['id'] = $args['id'] . '-' . $n++;
+                } else {
+                        do {
+                                $_args['id'] = 'sidebar-' . $n++;
+                        } while ( isset($wp_registered_sidebars[$_args['id']]) );
+                }
                 register_sidebar($_args);
         }