Wizard 2.8.2-scripts

[autoinstalls/wordpress.git] / wp-admin / includes / widgets.php

diff --git a/wp-admin/includes/widgets.php b/wp-admin/includes/widgets.php
index 2be814534500c5f5ba5fe3c25455b808c87bdd7d..d6d930dae0c8040a6b5b379eb02b08165b8b943f 100644 (file)
--- a/wp-admin/includes/widgets.php
+++ b/wp-admin/includes/widgets.php
@@ -97,10 +97,13 @@ function wp_list_widget_controls_dynamic_sidebar( $params ) {
 
 function next_widget_id_number($id_base) {
        global $wp_registered_widgets;
-       $number = 2;
+       $number = 1;
 
-       while ( isset($wp_registered_widgets["$id_base-$number"]) )
-               $number++;
+       foreach ( $wp_registered_widgets as $widget_id => $widget ) {
+               if ( preg_match( '/' . $id_base . '-([0-9]+)$/', $widget_id, $matches ) )
+                       $number = max($number, $matches[1]);
+       }
+       $number++;
 
        return $number;
 }