Changeset 36852 for trunk/src/wp-admin/nav-menus.php

Timestamp:

03/05/2016 12:46:45 AM (9 years ago)

Author:

ericlewis

Message:

Menus: Ensure theme location setting data is saved with a large menu.

[36510] introduced a fix to allow users to save large menus on the Edit Menu screen (70+ menu items). The form data is stored as JSON which is used to inject the $_POST variable in the form submission handler. This injection was not setting form items with named array elements properly (e.g. menu-locations[primary]), which did not save theme location data in a large form.

Props keraweb.
See #14134.

File:

• trunk/src/wp-admin/nav-menus.php (modified) (2 diffs)

trunk/src/wp-admin/nav-menus.php

@@ -52 +52 @@
 /*
  * If a JSON blob of navigation menu data is found, expand it and inject it
- * into `$_POST` to avoid PHP `max_input_vars` limitations. See #14134. 
+ * into `$_POST` to avoid PHP `max_input_vars` limitations. See #14134.
  */
 if ( isset( $_POST['nav-menu-data'] ) ) {
@@ -59 +59 @@
         foreach ( $data as $post_input_data ) {
             // For input names that are arrays (e.g. `menu-item-db-id[3]`), derive the array path keys via regex.
-            if ( preg_match( '#(.*)(?:\[(\d+)\])#', $post_input_data->name, $matches ) ) {
+            if ( preg_match( '#(.*)\[(\w+)\]#', $post_input_data->name, $matches ) ) {
                 if ( empty( $_POST[ $matches[1] ] ) ) {
                     $_POST[ $matches[1] ] = array();
                 }
-                $_POST[ $matches[1] ][ (int) $matches[2] ] = wp_slash( $post_input_data->value );
+                // Cast input elements with a numeric array index to integers.
+                if ( is_numeric( $matches[2] ) ) {
+                    $matches[2] = (int) $matches[2];
+                }
+                $_POST[ $matches[1] ][ $matches[2] ] = wp_slash( $post_input_data->value );
             } else {
                 $_POST[ $post_input_data->name ] = wp_slash( $post_input_data->value );