Changeset 13699

Timestamp:

03/14/2010 11:34:51 AM (15 years ago)

Author:

dd32

Message:

Simplify the Id uniqueness loops. Guard against more use-cases which might cause ID conflicts. See #12606

File:

• trunk/wp-includes/widgets.php (modified) (1 diff)

trunk/wp-includes/widgets.php

@@ -490 +490 @@
             $_args['name'] = isset($args['name']) ? $args['name'] : __('Sidebar');
 
-        if ( isset($args['id']) ) {
-            $_args['id'] = $args['id'];
-            if ( $number > 1 ) // Ensure that for multiple additions, the ID is unique (even if specified). Append -xx for > 1 sidebars.
-                $_args['id'] .= '-' . $i;
-        } else {
-            $n = count($wp_registered_sidebars);
-            do {
-                $n++;
-                $_args['id'] = "sidebar-$n";
-            } while ( isset($wp_registered_sidebars[$_args['id']]) );
-        }
+        $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++;
 
         register_sidebar($_args);