<!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>[55873] trunk/src/wp-admin/includes/menu.php: Coding Standards: Use strict comparison in `wp-admin/includes/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/55873">55873</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/55873","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>2023-05-31 14:51:22 +0000 (Wed, 31 May 2023)</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-admin/includes/menu.php`.
Includes minor code layout fixes for better readability.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/3536">[3536]</a>, <a href="https://core.trac.wordpress.org/changeset/4093">[4093]</a>, <a href="https://core.trac.wordpress.org/changeset/9578">[9578]</a>, <a href="https://core.trac.wordpress.org/changeset/11092">[11092]</a>, <a href="https://core.trac.wordpress.org/changeset/18034">[18034]</a>.
Props aristath, poena, afercia, SergeyBiryukov.
See <a href="https://core.trac.wordpress.org/ticket/57839">#57839</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesmenuphp">trunk/src/wp-admin/includes/menu.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesmenuphp"></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/includes/menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/menu.php 2023-05-30 19:44:56 UTC (rev 55872)
+++ trunk/src/wp-admin/includes/menu.php 2023-05-31 14:51:22 UTC (rev 55873)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,11 +44,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Create list of page plugin hook names.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $menu as $menu_page ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $pos = strpos( $menu_page[2], '?' );
</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 ( false !== $pos ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Handle post_type=post|page|foo pages.
</span><span class="cx" style="display: block; padding: 0 10px"> $hook_name = substr( $menu_page[2], 0, $pos );
</span><span class="cx" style="display: block; padding: 0 10px"> $hook_args = substr( $menu_page[2], $pos + 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_parse_str( $hook_args, $hook_args );
</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 hook name to be the post type.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $hook_args['post_type'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $hook_name = $hook_args['post_type'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,6 +61,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $hook_name = basename( $menu_page[2], '.php' );
</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"> $hook_name = sanitize_title( $hook_name );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $compat[ $hook_name ] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,18 +101,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $submenu[ $data[2] ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</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"> $subs = $submenu[ $data[2] ];
</span><span class="cx" style="display: block; padding: 0 10px"> $first_sub = reset( $subs );
</span><span class="cx" style="display: block; padding: 0 10px"> $old_parent = $data[2];
</span><span class="cx" style="display: block; padding: 0 10px"> $new_parent = $first_sub[2];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * If the first submenu is not the same as the assigned parent,
</span><span class="cx" style="display: block; padding: 0 10px"> * make the first submenu the new 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">- if ( $new_parent != $old_parent ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $new_parent !== $old_parent ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_wp_real_parent_file[ $old_parent ] = $new_parent;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu[ $id ][2] = $new_parent;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu[ $id ][2] = $new_parent;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $submenu[ $old_parent ] as $index => $data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $submenu[ $new_parent ][ $index ] = $submenu[ $old_parent ][ $index ];
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $submenu[ $old_parent ][ $index ] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +177,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $submenu[ $data[2] ] ) && 1 === count( $submenu[ $data[2] ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $subs = $submenu[ $data[2] ];
</span><span class="cx" style="display: block; padding: 0 10px"> $first_sub = reset( $subs );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $data[2] == $first_sub[2] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( $data[2] === $first_sub[2] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $submenu[ $data[2] ] );
</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">@@ -217,12 +224,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $first_item = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $last_order = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $items_count = count( $menu );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $i = 0;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $i = 0;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $menu as $order => $top ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $i++;
</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 == $order ) { // Dashboard is always shown/single.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 === $order ) { // Dashboard is always shown/single.
</ins><span class="cx" style="display: block; padding: 0 10px"> $menu[0][4] = add_cssclass( 'menu-top-first', $top[4] );
</span><span class="cx" style="display: block; padding: 0 10px"> $last_order = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -229,20 +237,23 @@
</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 ( str_starts_with( $top[2], 'separator' ) && false !== $last_order ) { // If separator.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $first_item = true;
- $classes = $menu[ $last_order ][4];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $first_item = true;
+ $classes = $menu[ $last_order ][4];
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $menu[ $last_order ][4] = add_cssclass( 'menu-top-last', $classes );
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $first_item ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $classes = $menu[ $order ][4];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $first_item = false;
+ $classes = $menu[ $order ][4];
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $menu[ $order ][4] = add_cssclass( 'menu-top-first', $classes );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $first_item = false;
</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"> if ( $i === $items_count ) { // Last item.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $classes = $menu[ $order ][4];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $classes = $menu[ $order ][4];
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $menu[ $order ][4] = add_cssclass( 'menu-top-last', $classes );
</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">@@ -272,10 +283,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( apply_filters( 'custom_menu_order', false ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_order = 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 ( $menu as $menu_item ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_order[] = $menu_item[2];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $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"> $default_menu_order = $menu_order;
</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">@@ -290,8 +303,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $menu_order An ordered array of menu items.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_order = apply_filters( 'menu_order', $menu_order );
- $menu_order = array_flip( $menu_order );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu_order = apply_filters( 'menu_order', $menu_order );
+ $menu_order = array_flip( $menu_order );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $default_menu_order = array_flip( $default_menu_order );
</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">@@ -304,14 +318,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function sort_menu( $a, $b ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $menu_order, $default_menu_order;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $a = $a[2];
</span><span class="cx" style="display: block; padding: 0 10px"> $b = $b[2];
</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_order[ $a ] ) && ! isset( $menu_order[ $b ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return -1;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! isset( $menu_order[ $a ] ) && isset( $menu_order[ $b ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return 1;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $menu_order[ $a ] ) && isset( $menu_order[ $b ] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $menu_order[ $a ] == $menu_order[ $b ] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $menu_order[ $a ] === $menu_order[ $b ] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return ( $menu_order[ $a ] < $menu_order[ $b ] ) ? -1 : 1;
</span></span></pre>
</div>
</div>
</body>
</html>