diff --git a/wp-admin/nav-menus.php b/wp-admin/nav-menus.php index 2ab63343ee..ab15beded0 100644 --- a/wp-admin/nav-menus.php +++ b/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 ); } diff --git a/wp-includes/version.php b/wp-includes/version.php index 3e8cebf0a7..f3b9213378 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.5-beta2-36851'; +$wp_version = '4.5-beta2-36852'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.