<!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>[48764] trunk/src/wp-admin/includes/plugin.php: Coding Standards: Fix WPCS issues in `wp-admin/includes/plugin.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/48764">48764</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/48764","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-08-08 21:02:18 +0000 (Sat, 08 Aug 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/includes/plugin.php`.
Includes minor code layout fixes for better readability.
Props rnaby for initial patch.
See <a href="https://core.trac.wordpress.org/ticket/50767">#50767</a>, <a href="https://core.trac.wordpress.org/ticket/43848">#43848</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludespluginphp">trunk/src/wp-admin/includes/plugin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludespluginphp"></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/plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/plugin.php 2020-08-08 21:00:09 UTC (rev 48763)
+++ trunk/src/wp-admin/includes/plugin.php 2020-08-08 21:02:18 UTC (rev 48764)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -651,7 +651,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $requirements;
</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">- if ( ( $network_wide && ! isset( $current[ $plugin ] ) ) || ( ! $network_wide && ! in_array( $plugin, $current, true ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $network_wide && ! isset( $current[ $plugin ] )
+ || ! $network_wide && ! in_array( $plugin, $current, true )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $redirect ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // We'll override this later if the plugin can be included without fatal error.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( add_query_arg( '_error_nonce', wp_create_nonce( 'plugin-activation-error_' . $plugin ), $redirect ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -764,7 +766,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $network_deactivating = false !== $network_wide && is_plugin_active_for_network( $plugin );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $network_deactivating = ( false !== $network_wide ) && is_plugin_active_for_network( $plugin );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $silent ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -978,7 +980,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If plugin is in its own directory, recursively delete the directory.
</span><span class="cx" style="display: block; padding: 0 10px"> // Base check on if plugin includes directory separator AND that it's not the root plugin folder.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos( $plugin_file, '/' ) && $this_plugin_dir != $plugins_dir ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( strpos( $plugin_file, '/' ) && $this_plugin_dir !== $plugins_dir ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $deleted = $wp_filesystem->delete( $this_plugin_dir, true );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $deleted = $wp_filesystem->delete( $plugins_dir . $plugin_file );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1150,8 +1152,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $compatible_wp = is_wp_version_compatible( $requirements['requires'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $compatible_php = is_php_version_compatible( $requirements['requires_php'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: URL to Update PHP page. */
</del><span class="cx" style="display: block; padding: 0 10px"> $php_update_message = '</p><p>' . sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: URL to Update PHP page. */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( '<a href="%s">Learn more about updating PHP</a>.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( wp_get_update_php_url() )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1414,9 +1416,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * parent file someone is trying to link back to the parent manually. In
</span><span class="cx" style="display: block; padding: 0 10px"> * this case, don't automatically add a link back to avoid duplication.
</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 ( ! isset( $submenu[ $parent_slug ] ) && $menu_slug != $parent_slug ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $submenu[ $parent_slug ] ) && $menu_slug !== $parent_slug ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $menu as $parent_menu ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $parent_menu[2] == $parent_slug && current_user_can( $parent_menu[1] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $parent_menu[2] === $parent_slug && current_user_can( $parent_menu[1] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $submenu[ $parent_slug ][] = array_slice( $parent_menu, 0, 4 );
</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">@@ -1767,7 +1769,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $menu;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $menu as $i => $item ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $menu_slug == $item[2] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $menu_slug === $item[2] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $menu[ $i ] );
</span><span class="cx" style="display: block; padding: 0 10px"> return $item;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1795,7 +1797,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"> foreach ( $submenu[ $menu_slug ] as $i => $item ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $submenu_slug == $item[2] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $submenu_slug === $item[2] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $submenu[ $menu_slug ][ $i ] );
</span><span class="cx" style="display: block; padding: 0 10px"> return $item;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1822,6 +1824,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_parent_pages[ $menu_slug ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_slug = $_parent_pages[ $menu_slug ];
</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 ( $parent_slug && ! isset( $_parent_pages[ $parent_slug ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = admin_url( add_query_arg( 'page', $menu_slug, $parent_slug ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1870,24 +1873,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_wp_real_parent_file[ $parent ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parent = $_wp_real_parent_file[ $parent ];
</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"> return $parent;
</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 ( 'admin.php' === $pagenow && isset( $plugin_page ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $menu as $parent_menu ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $parent_menu[2] == $plugin_page ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $parent_menu[2] === $plugin_page ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent_file = $plugin_page;
</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( $_wp_real_parent_file[ $parent_file ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_file = $_wp_real_parent_file[ $parent_file ];
</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"> return $parent_file;
</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 ( isset( $_wp_menu_nopriv[ $plugin_page ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_file = $plugin_page;
</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( $_wp_real_parent_file[ $parent_file ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_file = $_wp_real_parent_file[ $parent_file ];
</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"> return $parent_file;
</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">@@ -1894,9 +1902,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[ $pagenow ][ $plugin_page ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_file = $pagenow;
</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( $_wp_real_parent_file[ $parent_file ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_file = $_wp_real_parent_file[ $parent_file ];
</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"> return $parent_file;
</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">@@ -1905,13 +1915,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_wp_real_parent_file[ $parent ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parent = $_wp_real_parent_file[ $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 ( ! empty( $typenow ) && ( "$pagenow?post_type=$typenow" === $submenu_array[2] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( ! empty( $typenow ) && "$pagenow?post_type=$typenow" === $submenu_array[2] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent_file = $parent;
</span><span class="cx" style="display: block; padding: 0 10px"> return $parent;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $submenu_array[2] == $pagenow && empty( $typenow ) && ( empty( $parent_file ) || false === strpos( $parent_file, '?' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( empty( $typenow ) && $pagenow === $submenu_array[2]
+ && ( empty( $parent_file ) || false === strpos( $parent_file, '?' ) )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent_file = $parent;
</span><span class="cx" style="display: block; padding: 0 10px"> return $parent;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( isset( $plugin_page ) && ( $plugin_page == $submenu_array[2] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( isset( $plugin_page ) && $plugin_page === $submenu_array[2] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent_file = $parent;
</span><span class="cx" style="display: block; padding: 0 10px"> return $parent;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1953,10 +1966,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $parent ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $menu as $menu_array ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $menu_array[3] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $menu_array[2] == $pagenow ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $menu_array[2] === $pagenow ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = $menu_array[3];
</span><span class="cx" style="display: block; padding: 0 10px"> return $menu_array[3];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( isset( $plugin_page ) && ( $plugin_page == $menu_array[2] ) && ( $hook == $menu_array[5] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( isset( $plugin_page ) && $plugin_page === $menu_array[2] && $hook === $menu_array[5] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = $menu_array[3];
</span><span class="cx" style="display: block; padding: 0 10px"> return $menu_array[3];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1968,21 +1981,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array_keys( $submenu ) as $parent ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $submenu[ $parent ] as $submenu_array ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $plugin_page ) &&
- ( $plugin_page == $submenu_array[2] ) &&
- (
- ( $parent == $pagenow ) ||
- ( $parent == $plugin_page ) ||
- ( $plugin_page == $hook ) ||
- ( 'admin.php' === $pagenow && $parent1 != $submenu_array[2] ) ||
- ( ! empty( $typenow ) && $parent == $pagenow . '?post_type=' . $typenow )
- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $plugin_page )
+ && ( $plugin_page === $submenu_array[2] )
+ && ( $pagenow === $parent
+ || $plugin_page === $parent
+ || $plugin_page === $hook
+ || 'admin.php' === $pagenow && $parent1 !== $submenu_array[2]
+ || ! empty( $typenow ) && "$pagenow?post_type=$typenow" === $parent )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $title = $submenu_array[3];
</span><span class="cx" style="display: block; padding: 0 10px"> return $submenu_array[3];
</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">- if ( $submenu_array[2] != $pagenow || isset( $_GET['page'] ) ) { // Not the current page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $submenu_array[2] !== $pagenow || isset( $_GET['page'] ) ) { // Not the current page.
</ins><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1997,10 +2008,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $title ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $menu as $menu_array ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $plugin_page ) &&
- ( $plugin_page == $menu_array[2] ) &&
- ( 'admin.php' === $pagenow ) &&
- ( $parent1 == $menu_array[2] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $plugin_page )
+ && $plugin_page === $menu_array[2]
+ && 'admin.php' === $pagenow
+ && $parent1 === $menu_array[2]
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = $menu_array[3];
</span><span class="cx" style="display: block; padding: 0 10px"> return $menu_array[3];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2126,15 +2138,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</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">- if ( isset( $plugin_page ) && ( $plugin_page == $parent ) && isset( $_wp_menu_nopriv[ $plugin_page ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $plugin_page ) && ( $plugin_page === $parent ) && isset( $_wp_menu_nopriv[ $plugin_page ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</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 ( isset( $submenu[ $parent ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $submenu[ $parent ] as $submenu_array ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $plugin_page ) && ( $submenu_array[2] == $plugin_page ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $plugin_page ) && ( $submenu_array[2] === $plugin_page ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return current_user_can( $submenu_array[1] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $submenu_array[2] == $pagenow ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $submenu_array[2] === $pagenow ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return current_user_can( $submenu_array[1] );
</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">@@ -2141,7 +2153,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"> foreach ( $menu as $menu_array ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $menu_array[2] == $parent ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $menu_array[2] === $parent ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return current_user_can( $menu_array[1] );
</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>