Ticket #41502: 41502.diff

src/wp-admin/includes/nav-menu.php

@@ -1223 +1223 @@
  * If a JSON blob of navigation menu data is in POST data, expand it and inject
  * it into `$_POST` to avoid PHP `max_input_vars` limitations. See #14134.
  *
  * @ignore
  * @since 4.5.3
  * @access private
  */
 function _wp_expand_nav_menu_post_data() {
         if ( ! isset( $_POST['nav-menu-data'] ) ) {
                 return;
         }
 
         $data = json_decode( stripslashes( $_POST['nav-menu-data'] ) );
 
         if ( ! is_null( $data ) && $data ) {
+                $seen_empty_data_keys = array();
                 foreach ( $data as $post_input_data ) {
                         // For input names that are arrays (e.g. `menu-item-db-id[3][4][5]`),
                         // derive the array path keys via regex and set the value in $_POST.
-                        preg_match( '#([^\[]*)(\[(.+)\])?#', $post_input_data->name, $matches );
+                        preg_match( '#([^\[]*)(\[(.*)\])?#', $post_input_data->name, $matches );
 
                         $array_bits = array( $matches[1] );
 
-                        if ( isset( $matches[3] ) ) {
+                        if ( !empty( $matches[3] ) ) {
+                                // $name[..]
                                 $array_bits = array_merge( $array_bits, explode( '][', $matches[3] ) );
+                        } elseif ( isset( $matches[2] ) ) {
+                                // $name[]
+                                if ( ! isset( $seen_empty_data_keys[ $matches[1] ] ) ) {
+                                        $seen_empty_data_keys[ $matches[1] ] = 0;
+                                }
+
+                                $array_bits[] = $seen_empty_data_keys[ $matches[1] ]++;
                         }
 
                         $new_post_data = array();
 
                         // Build the new array value from leaf to trunk.
                         for ( $i = count( $array_bits ) - 1; $i >= 0; $i -- ) {
                                 if ( $i == count( $array_bits ) - 1 ) {
                                         $new_post_data[ $array_bits[ $i ] ] = wp_slash( $post_input_data->value );
                                 } else {
                                         $new_post_data = array( $array_bits[ $i ] => $new_post_data );
                                 }
                         }
 
                         $_POST = array_replace_recursive( $_POST, $new_post_data );
                 }

tests/phpunit/tests/menu/wpExpandNavMenuPostData.php

@@ -16 +16 @@
                 $data[0]                = new StdClass;
                 $data[0]->name          = 'yesorno';
                 $data[0]->value         = 'yes';
                 $_POST['nav-menu-data'] = addslashes( json_encode( $data ) );
 
                 _wp_expand_nav_menu_post_data();
 
                 $expected = array(
                         'nav-menu-data' => $_POST['nav-menu-data'],
                         'yesorno'       => 'yes',
                 );
 
                 $this->assertEquals( $expected, $_POST );
         }
 
+        /**
+         * @ticket 41502
+         */
+        public function test_ungrouped_data_should_expand() {
+                include_once( ABSPATH . 'wp-admin/includes/nav-menu.php' );
+
+                if ( empty( $_POST ) ) {
+                        $_POST = array();
+                }
+
+                $data                   = array();
+                $data[0]                = new StdClass;
+                $data[0]->name          = 'yesorno[]';
+                $data[0]->value         = 'yes';
+                $data[1]                = new StdClass;
+                $data[1]->name          = 'yesorno[]';
+                $data[1]->value         = 'maybe';
+                $_POST['nav-menu-data'] = addslashes( json_encode( $data ) );
+
+                _wp_expand_nav_menu_post_data();
+
+                $expected = array(
+                        'nav-menu-data' => $_POST['nav-menu-data'],
+                        'yesorno'       => array(
+                                'yes',
+                                'maybe'
+                        ),
+                );
+
+                $this->assertEquals( $expected, $_POST );
+        }
+
         public function test_multidimensional_nested_array_should_expand() {
                 include_once( ABSPATH . 'wp-admin/includes/nav-menu.php' );
 
                 if ( empty( $_POST ) ) {
                         $_POST = array();
                 }
 
                 $data                   = array();
                 $data[0]                = new StdClass;
                 $data[0]->name          = 'would[1][do][the][trick]';
                 $data[0]->value         = 'yes';
                 $_POST['nav-menu-data'] = addslashes( json_encode( $data ) );
 
                 _wp_expand_nav_menu_post_data();