From 44159f1afad3db3dd134ecfd9e661e47fcb12b63 Mon Sep 17 00:00:00 2001 From: Eric Andrew Lewis Date: Wed, 10 Feb 2016 14:10:17 +0000 Subject: [PATCH] Menus: Revert larger menu support in Edit Menus screen in [36506]. JSON encoding the form as it exists on the page will not scale. See #14134. git-svn-id: https://develop.svn.wordpress.org/trunk@36507 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/js/nav-menu.js | 25 ------------------------- src/wp-admin/nav-menus.php | 14 -------------- 2 files changed, 39 deletions(-) diff --git a/src/wp-admin/js/nav-menu.js b/src/wp-admin/js/nav-menu.js index abff8f937f..264dc574fc 100644 --- a/src/wp-admin/js/nav-menu.js +++ b/src/wp-admin/js/nav-menu.js @@ -43,7 +43,6 @@ var wpNavMenu; this.attachQuickSearchListeners(); this.attachThemeLocationsListeners(); - this.attachMenuSaveSubmitListeners(); this.attachTabsPanelListeners(); @@ -835,30 +834,6 @@ var wpNavMenu; }); }, - attachMenuSaveSubmitListeners : function() { - /* - * When a navigation menu is saved, store a JSON representation of all form data - * in a single input to avoid PHP `max_input_vars` limitations. See #14134. - */ - $('#update-nav-menu').submit(function() { - var navMenuData = {}; - $('#update-nav-menu input').each(function(index, element) { - var name = $(element).attr('name'); - var regex = /(.*)(?:\[(\d+)\])/; - if ( regex.test( name ) ) { - var matches = regex.exec(name); - if ( ! navMenuData[matches[1]] ) { - navMenuData[matches[1]] = []; - } - navMenuData[matches[1]][matches[2]] = $(element).val(); - } else { - navMenuData[name] = $(element).val(); - } - }); - $('[name="nav-menu-data"]').val( JSON.stringify( navMenuData ) ); - }); - }, - attachThemeLocationsListeners : function() { var loc = $('#nav-menu-theme-locations'), params = {}; params.action = 'menu-locations-save'; diff --git a/src/wp-admin/nav-menus.php b/src/wp-admin/nav-menus.php index deac6d2ca4..8f17e03031 100644 --- a/src/wp-admin/nav-menus.php +++ b/src/wp-admin/nav-menus.php @@ -49,19 +49,6 @@ $num_locations = count( array_keys( $locations ) ); // Allowed actions: add, update, delete $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. - */ -if ( isset( $_POST['nav-menu-data'] ) ) { - $data = json_decode( stripslashes( $_POST['nav-menu-data'] ) ); - if ( ! is_null( $data ) && $data ) { - foreach ( $data as $post_var => $post_data ) { - $_POST[$post_var] = $post_data; - } - } -} - switch ( $action ) { case 'add-menu-item': check_admin_referer( 'add-menu_item', 'menu-settings-column-nonce' ); @@ -744,7 +731,6 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );