Ticket #35023: get_field_name_3.patch

src/wp-includes/class-wp-widget.php

@@ -183 +183 @@
          * @param string $field_name Field name
          * @return string Name attribute for $field_name
          */
-        public function get_field_name($field_name) {
-                if ( false === $pos = strpos( $field_name, '[' ) ) {
+        public function get_field_name( $field_name ) {
+                if ( ! preg_match( '/]$/', $field_name ) ) {
                         return 'widget-' . $this->id_base . '[' . $this->number . '][' . $field_name . ']';
                 } else {
+                        if ( false === $pos = strpos( $field_name, '[' ) ) {
+                                return 'widget-' . $this->id_base . '[' . $this->number . '][' . $field_name;
+                        }
                         return 'widget-' . $this->id_base . '[' . $this->number . '][' . substr_replace( $field_name, '][', $pos, strlen( '[' ) );
                 }
         }

tests/phpunit/tests/widgets.php

@@ -351 +351 @@
                                 'widget-foo[2][posttypes][4][][6]',
                                 'posttypes[4][][6]',
                         ),
+                        array(
+                                'widget-foo[2][posttypes][name]',
+                                'posttypes][name',
+                        ),
+                        array(
+                                'widget-foo[2][][title]',
+                                '[title]',
+                        ),
+                        array(
+                                'widget-foo[2][title]',
+                                'title]',
+                        ),
                 );
         }