From ae1c49027a79e1c3d753a46d7d354069d73ff50b Mon Sep 17 00:00:00 2001 From: Eric Andrew Lewis Date: Sat, 5 Mar 2016 00:46:45 +0000 Subject: [PATCH] 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. git-svn-id: https://develop.svn.wordpress.org/trunk@36852 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/nav-menus.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/wp-admin/nav-menus.php b/src/wp-admin/nav-menus.php index 2ab63343ee..ab15beded0 100644 --- a/src/wp-admin/nav-menus.php +++ b/src/wp-admin/nav-menus.php @@ -51,18 +51,22 @@ $action = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] : 'edit'; /* * 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'] ) ) { $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( '#(.*)(?:\[(\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 ); }