Ticket #12133: patch.diff

wp-includes/widgets.php

@@ -107 +107 @@
          * @return string Name attribute for $field_name
          */
         function get_field_name($field_name) {
-                return 'widget-' . $this->id_base . '[' . $this->number . '][' . $field_name . ']';
+      if (strpos($field_name, '[') === false)
+                   return 'widget-' . $this->id_base . '[' . $this->number . '][' . ($field_name) . ']';
+      else
+         return 'widget-' . $this->id_base . '[' . $this->number . '][' . substr($field_name, 0, strpos($field_name, '[')) . ']' . substr($field_name, strpos($field_name, '['));
         }
 
         /**
@@ -119 +122 @@
          * @return string ID attribute for $field_name
          */
         function get_field_id($field_name) {
-                return 'widget-' . $this->id_base . '-' . $this->number . '-' . $field_name;
+                return 'widget-' . $this->id_base . '-' . $this->number . '-' . str_replace(array('][', '[', ']', ' '), '-', trim($field_name, ' []'));
         }
 
         // Private Functions. Don't worry about these.