Changeset 37748

Timestamp:

06/19/2016 12:24:23 PM (8 years ago)

Author:

swissspidy

Message:

Menus: Support nested array variables in POST data when saving menus.

[36510] allowed larger menus to be created in the Edit Menu screen by JSON-encoding the entire form into a single input field. However, it did not correctly handle nested arrays.

This introduces a new _wp_expand_nav_menu_post_data() helper function to handle this POST data which uses array_replace_recursive() internally. Since the latter is only available on PHP 5.3+, we add a compatibility function to ensure PHP 5.2 support.

Props ericlewis, neverything, swissspidy.
Fixes #36590 for trunk. See #14134.

Location:

trunk

Files:

• src/wp-admin/includes/nav-menu.php (modified) (1 diff)
• src/wp-admin/nav-menus.php (modified) (1 diff)
• src/wp-includes/compat.php (modified) (1 diff)
• tests/phpunit/tests/menu (added)
• tests/phpunit/tests/menu/wpExpandNavMenuPostData.php (added)

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

@@ -1060 +1060 @@
     return $messages;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -54 +54 @@
  * into `$_POST` to avoid PHP `max_input_vars` limitations. See #14134.
  */
-if ( isset( $_POST['nav-menu-data'] ) ) {
-    $data = json_decode( stripslashes( $_POST['nav-menu-data'] ) );
-    if ( ! is_null( $data ) && $data ) {
-        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( '#(.*)\[(\w+)\]#', $post_input_data->name, $matches ) ) {
-                if ( empty( $_POST[ $matches[1] ] ) ) {
-                    $_POST[ $matches[1] ] = array();
-                }
-                // 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 );
-            }
-        }
-    }
-}
+_wp_expand_nav_menu_post_data();
+
 switch ( $action ) {
     case 'add-menu-item':

trunk/src/wp-includes/compat.php

@@ -436 +436 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 // SPL can be disabled on PHP 5.2
 if ( ! function_exists( 'spl_autoload_register' ) ):