<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[36507] trunk/src/wp-admin: Menus: Revert larger menu support in Edit Menus screen in [36506].</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/36507">36507</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/36507","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ericlewis</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-02-10 14:10:17 +0000 (Wed, 10 Feb 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Menus: Revert larger menu support in Edit Menus screen in <a href="https://core.trac.wordpress.org/changeset/36506">[36506]</a>.
JSON encoding the form as it exists on the page will not scale.
See <a href="https://core.trac.wordpress.org/ticket/14134">#14134</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjsnavmenujs">trunk/src/wp-admin/js/nav-menu.js</a></li>
<li><a href="#trunksrcwpadminnavmenusphp">trunk/src/wp-admin/nav-menus.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjsnavmenujs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/nav-menu.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/nav-menu.js 2016-02-10 03:31:31 UTC (rev 36506)
+++ trunk/src/wp-admin/js/nav-menu.js 2016-02-10 14:10:17 UTC (rev 36507)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,7 +43,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.attachQuickSearchListeners();
</span><span class="cx" style="display: block; padding: 0 10px"> this.attachThemeLocationsListeners();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.attachMenuSaveSubmitListeners();
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.attachTabsPanelListeners();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -835,30 +834,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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 ) );
- });
- },
-
</del><span class="cx" style="display: block; padding: 0 10px"> attachThemeLocationsListeners : function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var loc = $('#nav-menu-theme-locations'), params = {};
</span><span class="cx" style="display: block; padding: 0 10px"> params.action = 'menu-locations-save';
</span></span></pre></div>
<a id="trunksrcwpadminnavmenusphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/nav-menus.php 2016-02-10 03:31:31 UTC (rev 36506)
+++ trunk/src/wp-admin/nav-menus.php 2016-02-10 14:10:17 UTC (rev 36507)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,19 +49,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Allowed actions: add, update, delete
</span><span class="cx" style="display: block; padding: 0 10px"> $action = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] : 'edit';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*
- * 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;
- }
- }
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> switch ( $action ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'add-menu-item':
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'add-menu_item', 'menu-settings-column-nonce' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -744,7 +731,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="menu-management">
</span><span class="cx" style="display: block; padding: 0 10px"> <form id="update-nav-menu" method="post" enctype="multipart/form-data">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="menu-edit <?php if ( $add_new_screen ) echo 'blank-slate'; ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="hidden" name="nav-menu-data">
</del><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false );
</span></span></pre>
</div>
</div>
</body>
</html>