<!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>[48063] trunk/src/wp-admin/nav-menus.php: Coding Standards: Fix WPCS issues in `wp-admin/nav-menus.php`.</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 { white-space: pre-line; 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/48063">48063</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/48063","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-06-16 18:36:42 +0000 (Tue, 16 Jun 2020)</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'>Coding Standards: Fix WPCS issues in `wp-admin/nav-menus.php`.
Includes minor code layout fixes for better readability.
See <a href="https://core.trac.wordpress.org/ticket/49542">#49542</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminnavmenusphp">trunk/src/wp-admin/nav-menus.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2020-06-16 17:27:05 UTC (rev 48062)
+++ trunk/src/wp-admin/nav-menus.php 2020-06-16 18:36:42 UTC (rev 48063)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,18 +60,24 @@
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST['nav-menu-locations'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> set_theme_mod( 'nav_menu_locations', array_map( 'absint', $_REQUEST['menu-locations'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_REQUEST['menu-item'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_save_nav_menu_items( $nav_menu_selected_id, $_REQUEST['menu-item'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'move-down-menu-item':
</span><span class="cx" style="display: block; padding: 0 10px"> // Moving down a menu item is the same as moving up the next in order.
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'move-menu_item' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $menu_item_id = isset( $_REQUEST['menu-item'] ) ? (int) $_REQUEST['menu-item'] : 0;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_nav_menu_item( $menu_item_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $menus = isset( $_REQUEST['menu'] ) ? array( (int) $_REQUEST['menu'] ) : wp_get_object_terms( $menu_item_id, 'nav_menu', array( 'fields' => 'ids' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_wp_error( $menus ) && ! empty( $menus[0] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_id = (int) $menus[0];
</span><span class="cx" style="display: block; padding: 0 10px"> $ordered_menu_items = wp_get_nav_menu_items( $menu_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,6 +86,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Set up the data we need in one pass through the array of menu items.
</span><span class="cx" style="display: block; padding: 0 10px"> $dbids_to_orders = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $orders_to_dbids = array();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $ordered_menu_items as $ordered_menu_item_object ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $ordered_menu_item_object->ID ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $ordered_menu_item_object->menu_order ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,19 +97,14 @@
</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"> // Get next in order.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (
- isset( $orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] + 1 ] )
- ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] + 1 ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $next_item_id = $orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] + 1 ];
</span><span class="cx" style="display: block; padding: 0 10px"> $next_item_data = (array) wp_setup_nav_menu_item( get_post( $next_item_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If not siblings of same parent, bubble menu item up but keep order.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (
- ! empty( $menu_item_data['menu_item_parent'] ) &&
- (
- empty( $next_item_data['menu_item_parent'] ) ||
- $next_item_data['menu_item_parent'] != $menu_item_data['menu_item_parent']
- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $menu_item_data['menu_item_parent'] )
+ && ( empty( $next_item_data['menu_item_parent'] )
+ || (int) $next_item_data['menu_item_parent'] !== (int) $menu_item_data['menu_item_parent'] )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( (int) $menu_item_data['menu_item_parent'], $orders_to_dbids, true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_db_id = (int) $menu_item_data['menu_item_parent'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,7 +118,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_data = (array) $parent_object;
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item_data['menu_item_parent'] = $parent_data['menu_item_parent'];
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><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"> // Make menu item a child of its next sibling.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,9 +133,8 @@
</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"> // The item is last but still has a parent, so bubble up.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif (
- ! empty( $menu_item_data['menu_item_parent'] ) &&
- in_array( (int) $menu_item_data['menu_item_parent'], $orders_to_dbids, true )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! empty( $menu_item_data['menu_item_parent'] )
+ && in_array( (int) $menu_item_data['menu_item_parent'], $orders_to_dbids, true )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item_data['menu_item_parent'] = (int) get_post_meta( $menu_item_data['menu_item_parent'], '_menu_item_menu_item_parent', true );
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,11 +143,19 @@
</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"> break;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'move-up-menu-item':
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'move-menu_item' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $menu_item_id = isset( $_REQUEST['menu-item'] ) ? (int) $_REQUEST['menu-item'] : 0;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_nav_menu_item( $menu_item_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menus = isset( $_REQUEST['menu'] ) ? array( (int) $_REQUEST['menu'] ) : wp_get_object_terms( $menu_item_id, 'nav_menu', array( 'fields' => 'ids' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_REQUEST['menu'] ) ) {
+ $menus = array( (int) $_REQUEST['menu'] );
+ } else {
+ $menus = wp_get_object_terms( $menu_item_id, 'nav_menu', array( 'fields' => 'ids' ) );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_wp_error( $menus ) && ! empty( $menus[0] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_id = (int) $menus[0];
</span><span class="cx" style="display: block; padding: 0 10px"> $ordered_menu_items = wp_get_nav_menu_items( $menu_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,6 +164,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Set up the data we need in one pass through the array of menu items.
</span><span class="cx" style="display: block; padding: 0 10px"> $dbids_to_orders = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $orders_to_dbids = array();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $ordered_menu_items as $ordered_menu_item_object ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $ordered_menu_item_object->ID ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $ordered_menu_item_object->menu_order ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,14 +175,15 @@
</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"> // If this menu item is not first.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $dbids_to_orders[ $menu_item_id ] ) && ! empty( $orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] - 1 ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $dbids_to_orders[ $menu_item_id ] )
+ && ! empty( $orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] - 1 ] )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If this menu item is a child of the previous.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (
- ! empty( $menu_item_data['menu_item_parent'] ) &&
- in_array( (int) $menu_item_data['menu_item_parent'], array_keys( $dbids_to_orders ), true ) &&
- isset( $orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] - 1 ] ) &&
- ( $menu_item_data['menu_item_parent'] == $orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] - 1 ] )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $menu_item_data['menu_item_parent'] )
+ && in_array( (int) $menu_item_data['menu_item_parent'], array_keys( $dbids_to_orders ), true )
+ && isset( $orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] - 1 ] )
+ && ( (int) $menu_item_data['menu_item_parent'] === $orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] - 1 ] )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( (int) $menu_item_data['menu_item_parent'], $orders_to_dbids, true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_db_id = (int) $menu_item_data['menu_item_parent'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,10 +200,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * If there is something before the parent and parent a child of it,
</span><span class="cx" style="display: block; padding: 0 10px"> * make menu item a child also of it.
</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 (
- ! empty( $dbids_to_orders[ $parent_db_id ] ) &&
- ! empty( $orders_to_dbids[ $dbids_to_orders[ $parent_db_id ] - 1 ] ) &&
- ! empty( $parent_data['menu_item_parent'] )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $dbids_to_orders[ $parent_db_id ] )
+ && ! empty( $orders_to_dbids[ $dbids_to_orders[ $parent_db_id ] - 1 ] )
+ && ! empty( $parent_data['menu_item_parent'] )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item_data['menu_item_parent'] = $parent_data['menu_item_parent'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -201,11 +210,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Else if there is something before parent and parent not a child of it,
</span><span class="cx" style="display: block; padding: 0 10px"> * make menu item a child of that something's parent
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif (
- ! empty( $dbids_to_orders[ $parent_db_id ] ) &&
- ! empty( $orders_to_dbids[ $dbids_to_orders[ $parent_db_id ] - 1 ] )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! empty( $dbids_to_orders[ $parent_db_id ] )
+ && ! empty( $orders_to_dbids[ $dbids_to_orders[ $parent_db_id ] - 1 ] )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $_possible_parent_id = (int) get_post_meta( $orders_to_dbids[ $dbids_to_orders[ $parent_db_id ] - 1 ], '_menu_item_menu_item_parent', true );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $_possible_parent_id, array_keys( $dbids_to_orders ), true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item_data['menu_item_parent'] = $_possible_parent_id;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -230,12 +239,11 @@
</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"> // Else this menu item is not a child of the previous.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif (
- empty( $menu_item_data['menu_order'] ) ||
- empty( $menu_item_data['menu_item_parent'] ) ||
- ! in_array( (int) $menu_item_data['menu_item_parent'], array_keys( $dbids_to_orders ), true ) ||
- empty( $orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] - 1 ] ) ||
- $orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] - 1 ] != $menu_item_data['menu_item_parent']
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( empty( $menu_item_data['menu_order'] )
+ || empty( $menu_item_data['menu_item_parent'] )
+ || ! in_array( (int) $menu_item_data['menu_item_parent'], array_keys( $dbids_to_orders ), true )
+ || empty( $orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] - 1 ] )
+ || $orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] - 1 ] !== (int) $menu_item_data['menu_item_parent']
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Just make it a child of the previous; keep the order.
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item_data['menu_item_parent'] = (int) $orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] - 1 ];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,6 +253,7 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'delete-menu-item':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,10 +264,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_nav_menu_item( $menu_item_id ) && wp_delete_post( $menu_item_id, true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'The menu item has been successfully deleted.' ) . '</p></div>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'delete':
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'delete-nav_menu-' . $nav_menu_selected_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_nav_menu( $nav_menu_selected_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $deletion = wp_delete_nav_menu( $nav_menu_selected_id );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -276,10 +287,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'The menu has been successfully deleted.' ) . '</p></div>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'delete_menus':
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'nav_menus_bulk_actions' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $_REQUEST['delete_menus'] as $menu_id_to_delete ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_nav_menu( $menu_id_to_delete ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -286,6 +299,7 @@
</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"> $deletion = wp_delete_nav_menu( $menu_id_to_delete );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $deletion ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $deletion->get_error_message() . '</p></div>';
</span><span class="cx" style="display: block; padding: 0 10px"> $deletion_error = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -295,6 +309,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $deletion_error ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Selected menus have been successfully deleted.' ) . '</p></div>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'update':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,7 +322,7 @@
</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"> // Add Menu.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 0 == $nav_menu_selected_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 === $nav_menu_selected_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $new_menu_title = trim( esc_html( $_POST['menu-name'] ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $new_menu_title ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -319,9 +334,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_menu_object = wp_get_nav_menu_object( $_nav_menu_selected_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $nav_menu_selected_id = $_nav_menu_selected_id;
</span><span class="cx" style="display: block; padding: 0 10px"> $nav_menu_selected_title = $_menu_object->name;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST['menu-item'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_save_nav_menu_items( $nav_menu_selected_id, absint( $_REQUEST['menu-item'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Set the menu_location value correctly for the newly created menu.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $menu_locations as $location => $id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 === $id ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -328,26 +345,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_locations[ $location ] = $nav_menu_selected_id;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> set_theme_mod( 'nav_menu_locations', $menu_locations );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST['zero-menu-state'] ) || ! empty( $_POST['auto-add-pages'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If there are menu items, add them.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_nav_menu_update_menu_items( $nav_menu_selected_id, $nav_menu_selected_title );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST['zero-menu-state'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Auto-save nav_menu_locations.
</span><span class="cx" style="display: block; padding: 0 10px"> $locations = get_nav_menu_locations();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $locations as $location => $menu_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $locations[ $location ] = $nav_menu_selected_id;
</span><span class="cx" style="display: block; padding: 0 10px"> break; // There should only be 1.
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> set_theme_mod( 'nav_menu_locations', $locations );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST['use-location'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $locations = get_registered_nav_menus();
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_locations = get_nav_menu_locations();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $locations[ $_REQUEST['use-location'] ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_locations[ $_REQUEST['use-location'] ] = $nav_menu_selected_id;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> set_theme_mod( 'nav_menu_locations', $menu_locations );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -362,7 +387,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove menu locations that have been unchecked.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $locations as $location => $description ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( empty( $_POST['menu-locations'] ) || empty( $_POST['menu-locations'][ $location ] ) ) && isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $nav_menu_selected_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( empty( $_POST['menu-locations'] ) || empty( $_POST['menu-locations'][ $location ] ) )
+ && isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] === $nav_menu_selected_id
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $menu_locations[ $location ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -373,6 +400,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_menu_object = wp_get_nav_menu_object( $nav_menu_selected_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_title = trim( esc_html( $_POST['menu-name'] ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $menu_title ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __( 'Please enter a valid menu name.' ) . '</p></div>';
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_title = $_menu_object->name;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -380,6 +408,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_wp_error( $_menu_object ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $_nav_menu_selected_id = wp_update_nav_menu_object( $nav_menu_selected_id, array( 'menu-name' => $menu_title ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $_nav_menu_selected_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $_menu_object = $_nav_menu_selected_id;
</span><span class="cx" style="display: block; padding: 0 10px"> $messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $_nav_menu_selected_id->get_error_message() . '</p></div>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -394,13 +423,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $messages = array_merge( $messages, wp_nav_menu_update_menu_items( $_nav_menu_selected_id, $nav_menu_selected_title ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If the menu ID changed, redirect to the new URL.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $nav_menu_selected_id != $_nav_menu_selected_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $nav_menu_selected_id !== $_nav_menu_selected_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( admin_url( 'nav-menus.php?menu=' . intval( $_nav_menu_selected_id ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'locations':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $num_locations ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( admin_url( 'nav-menus.php' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -419,6 +450,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Menu locations updated.' ) . '</p></div>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -427,7 +459,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_count = count( $nav_menus );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Are we on the add new screen?
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$add_new_screen = ( isset( $_GET['menu'] ) && 0 == $_GET['menu'] ) ? true : false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$add_new_screen = ( isset( $_GET['menu'] ) && 0 === (int) $_GET['menu'] ) ? true : false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $locations_screen = ( isset( $_GET['action'] ) && 'locations' === $_GET['action'] ) ? true : false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -469,7 +501,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Redirect to add screen if there are no menus and this users has either zero,
</span><span class="cx" style="display: block; padding: 0 10px"> * or more than 1 theme locations.
</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 ( 0 == $menu_count && ! $add_new_screen && ! $one_theme_location_no_menus ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( 0 === $menu_count && ! $add_new_screen && ! $one_theme_location_no_menus ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( admin_url( 'nav-menus.php?action=edit&menu=0' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -485,7 +517,7 @@
</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"> // On deletion of menu, if another menu exists, show it.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! $add_new_screen && 0 < $menu_count && isset( $_GET['action'] ) && 'delete' === $_GET['action'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! $add_new_screen && $menu_count > 0 && isset( $_GET['action'] ) && 'delete' === $_GET['action'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $nav_menu_selected_id = $nav_menus[0]->term_id;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -498,7 +530,7 @@
</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"> // Update the user's setting.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( $nav_menu_selected_id != $recently_edited && is_nav_menu( $nav_menu_selected_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( $nav_menu_selected_id !== $recently_edited && is_nav_menu( $nav_menu_selected_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_user_meta( $current_user->ID, 'nav_menu_recently_edited', $nav_menu_selected_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -652,7 +684,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $nav_tab_active_class = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $nav_aria_current = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! isset( $_GET['action'] ) || isset( $_GET['action'] ) && 'locations' != $_GET['action'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( ! isset( $_GET['action'] ) || isset( $_GET['action'] ) && 'locations' !== $_GET['action'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $nav_tab_active_class = ' nav-tab-active';
</span><span class="cx" style="display: block; padding: 0 10px"> $nav_aria_current = ' aria-current="page"';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -666,6 +699,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $num_locations && $menu_count ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $active_tab_class = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $aria_current = '';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $locations_screen ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $active_tab_class = ' nav-tab-active';
</span><span class="cx" style="display: block; padding: 0 10px"> $aria_current = ' aria-current="page"';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -683,7 +717,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $locations_screen ) :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 1 == $num_locations ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 1 === $num_locations ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<p>' . __( 'Your theme supports one menu. Select which menu you would like to use.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p>' . sprintf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -716,7 +750,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $nav_menus as $menu ) :
</span><span class="cx" style="display: block; padding: 0 10px"> $data_orig = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $selected = isset( $menu_locations[ $_location ] ) && $menu_locations[ $_location ] == $menu->term_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $selected = isset( $menu_locations[ $_location ] ) && $menu_locations[ $_location ] === $menu->term_id;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $selected ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data_orig = 'data-orig="true"';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -727,7 +762,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="locations-row-links">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( isset( $menu_locations[ $_location ] ) && 0 != $menu_locations[ $_location ] ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( isset( $menu_locations[ $_location ] ) && 0 !== $menu_locations[ $_location ] ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="locations-edit-menu-link">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -879,7 +914,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $metabox_holder_disabled_class = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $_GET['menu'] ) && '0' == $_GET['menu'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( isset( $_GET['menu'] ) && 0 === (int) $_GET['menu'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $metabox_holder_disabled_class = ' metabox-holder-disabled';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -937,6 +973,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $hide_style = '';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $menu_items ) && 0 === count( $menu_items ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $hide_style = 'style="display: none;"';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -971,6 +1008,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $no_menus_style = '';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $one_theme_location_no_menus ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $no_menus_style = 'style="display: none;"';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1002,22 +1040,25 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <fieldset class="menu-settings-group menu-theme-locations">
</span><span class="cx" style="display: block; padding: 0 10px"> <legend class="menu-settings-group-name howto"><?php _e( 'Display location' ); ?></legend>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php foreach ( $locations as $location => $description ) : ?>
- <div class="menu-settings-input checkbox-input">
- <input type="checkbox"<?php checked( isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $nav_menu_selected_id ); ?> name="menu-locations[<?php echo esc_attr( $location ); ?>]" id="locations-<?php echo esc_attr( $location ); ?>" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
- <label for="locations-<?php echo esc_attr( $location ); ?>"><?php echo $description; ?></label>
- <?php if ( ! empty( $menu_locations[ $location ] ) && $menu_locations[ $location ] != $nav_menu_selected_id ) : ?>
- <span class="theme-location-set">
- <?php
- printf(
- /* translators: %s: Menu name. */
- _x( '(Currently set to: %s)', 'menu location' ),
- wp_get_nav_menu_object( $menu_locations[ $location ] )->name
- );
- ?>
- </span>
- <?php endif; ?>
- </div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ foreach ( $locations as $location => $description ) :
+ $checked = isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] === $nav_menu_selected_id;
+ ?>
+ <div class="menu-settings-input checkbox-input">
+ <input type="checkbox"<?php checked( $checked ); ?> name="menu-locations[<?php echo esc_attr( $location ); ?>]" id="locations-<?php echo esc_attr( $location ); ?>" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
+ <label for="locations-<?php echo esc_attr( $location ); ?>"><?php echo $description; ?></label>
+ <?php if ( ! empty( $menu_locations[ $location ] ) && $menu_locations[ $location ] !== $nav_menu_selected_id ) : ?>
+ <span class="theme-location-set">
+ <?php
+ printf(
+ /* translators: %s: Menu name. */
+ _x( '(Currently set to: %s)', 'menu location' ),
+ wp_get_nav_menu_object( $menu_locations[ $location ] )->name
+ );
+ ?>
+ </span>
+ <?php endif; ?>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </fieldset>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>