<!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>[58119] trunk/src/wp-includes/nav-menu.php: Coding Standards: Use strict comparison in `wp-includes/nav-menu.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/58119">58119</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/58119","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>2024-05-08 18:35:10 +0000 (Wed, 08 May 2024)</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: Use strict comparison in `wp-includes/nav-menu.php`.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/14248">[14248]</a>, <a href="https://core.trac.wordpress.org/changeset/14285">[14285]</a>, <a href="https://core.trac.wordpress.org/changeset/14878">[14878]</a>, <a href="https://core.trac.wordpress.org/changeset/15008">[15008]</a>, <a href="https://core.trac.wordpress.org/changeset/22235">[22235]</a>, <a href="https://core.trac.wordpress.org/changeset/23897">[23897]</a>, <a href="https://core.trac.wordpress.org/changeset/23941">[23941]</a>, <a href="https://core.trac.wordpress.org/changeset/27150">[27150]</a>.
Props dhruvang21, aristath, poena, afercia, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/61160">#61160</a>. See <a href="https://core.trac.wordpress.org/ticket/60700">#60700</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesnavmenuphp">trunk/src/wp-includes/nav-menu.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesnavmenuphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/nav-menu.php 2024-05-08 17:02:06 UTC (rev 58118)
+++ trunk/src/wp-includes/nav-menu.php 2024-05-08 18:35:10 UTC (rev 58119)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -280,7 +280,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove this menu from any locations.
</span><span class="cx" style="display: block; padding: 0 10px"> $locations = get_nav_menu_locations();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $locations as $location => $menu_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $menu_id == $menu->term_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $menu_id === $menu->term_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $locations[ $location ] = 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">@@ -331,7 +331,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_possible_existing &&
</span><span class="cx" style="display: block; padding: 0 10px"> ! is_wp_error( $_possible_existing ) &&
</span><span class="cx" style="display: block; padding: 0 10px"> isset( $_possible_existing->term_id ) &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_possible_existing->term_id != $menu_id
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_possible_existing->term_id !== $menu_id
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu_exists',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -458,12 +458,22 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args( $menu_item_data, $defaults );
</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_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 === $menu_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['menu-item-position'] = 1;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 0 == (int) $args['menu-item-position'] ) {
- $menu_items = 0 == $menu_id ? array() : (array) wp_get_nav_menu_items( $menu_id, array( 'post_status' => 'publish,draft' ) );
- $last_item = array_pop( $menu_items );
- $args['menu-item-position'] = ( $last_item && isset( $last_item->menu_order ) ) ? 1 + $last_item->menu_order : count( $menu_items );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 0 === (int) $args['menu-item-position'] ) {
+ $menu_items = array();
+
+ if ( 0 !== $menu_id ) {
+ $menu_items = (array) wp_get_nav_menu_items( $menu_id, array( 'post_status' => 'publish,draft' ) );
+ }
+
+ $last_item = array_pop( $menu_items );
+
+ if ( $last_item && isset( $last_item->menu_order ) ) {
+ $args['menu-item-position'] = 1 + $last_item->menu_order;
+ } else {
+ $args['menu-item-position'] = count( $menu_items );
+ }
</ins><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"> $original_parent = 0 < $menu_item_db_id ? get_post_field( 'post_parent', $menu_item_db_id ) : 0;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -522,7 +532,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post['post_date'] = $post_date;
</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">- $update = 0 != $menu_item_db_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $update = 0 !== $menu_item_db_id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // New menu item. Default is draft status.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $update ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -582,7 +592,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $menu_item_db_id, '_menu_item_xfn', $args['menu-item-xfn'] );
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $menu_item_db_id, '_menu_item_url', sanitize_url( $args['menu-item-url'] ) );
</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_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 === $menu_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $menu_item_db_id, '_menu_item_orphaned', (string) time() );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( get_post_meta( $menu_item_db_id, '_menu_item_orphaned' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> delete_post_meta( $menu_item_db_id, '_menu_item_orphaned' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1059,7 +1069,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif (
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' === $object_type &&
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' === $menu_item_type &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get_post_meta( $menu_item->ID, '_menu_item_object', true ) == $taxonomy
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_post_meta( $menu_item->ID, '_menu_item_object', true ) === $taxonomy
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item_ids[] = (int) $menu_item->ID;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1146,7 +1156,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $items as $item ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $post->ID == $item->object_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $post->ID === (int) $item->object_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue 2;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>