Changeset 36507

Timestamp:

02/10/16 14:10:17 (22 months ago)

Author:

ericlewis

Message:

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.

Location:

trunk/src/wp-admin

Files:

• js/nav-menu.js (modified) (2 diffs)
• nav-menus.php (modified) (2 diffs)

trunk/src/wp-admin/js/nav-menu.js

@@ -44 +44 @@
             this.attachQuickSearchListeners();
             this.attachThemeLocationsListeners();
-            this.attachMenuSaveSubmitListeners();
 
             this.attachTabsPanelListeners();
@@ -836 +835 @@
         },
 
-        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 = {};

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

@@ -49 +49 @@
 // 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 ) {
@@ -745 +732 @@
             <form id="update-nav-menu" method="post" enctype="multipart/form-data">
                 <div class="menu-edit <?php if ( $add_new_screen ) echo 'blank-slate'; ?>">
-                    <input type="hidden" name="nav-menu-data">
                     <?php
                     wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );