<!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>[47218] trunk/src/wp-admin: Coding Standards: Use Yoda conditions in some `wp-admin` files.</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/47218">47218</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/47218","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-02-09 16:51:22 +0000 (Sun, 09 Feb 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: Use Yoda conditions in some `wp-admin` files.
Props subrataemfluence, marcio-zebedeu, bookdude13, 1naveengiri, alishankhan.
Fixes <a href="https://core.trac.wordpress.org/ticket/44365">#44365</a>, <a href="https://core.trac.wordpress.org/ticket/48455">#48455</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminadminphp">trunk/src/wp-admin/admin.php</a></li>
<li><a href="#trunksrcwpadmininstallphp">trunk/src/wp-admin/install.php</a></li>
<li><a href="#trunksrcwpadminmediauploadphp">trunk/src/wp-admin/media-upload.php</a></li>
<li><a href="#trunksrcwpadminmediaphp">trunk/src/wp-admin/media.php</a></li>
<li><a href="#trunksrcwpadminmsdeletesitephp">trunk/src/wp-admin/ms-delete-site.php</a></li>
<li><a href="#trunksrcwpadminoptionsphp">trunk/src/wp-admin/options.php</a></li>
<li><a href="#trunksrcwpadminpostphp">trunk/src/wp-admin/post.php</a></li>
<li><a href="#trunksrcwpadminupdatecorephp">trunk/src/wp-admin/update-core.php</a></li>
<li><a href="#trunksrcwpadminusernewphp">trunk/src/wp-admin/user-new.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminadminphp"></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/admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/admin.php 2020-02-09 16:30:41 UTC (rev 47217)
+++ trunk/src/wp-admin/admin.php 2020-02-09 16:51:22 UTC (rev 47218)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +72,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * If there are 50 or fewer sites, run every time. Otherwise, throttle to reduce load:
</span><span class="cx" style="display: block; padding: 0 10px"> * attempt to do no more than threshold value, with some +/- allowed.
</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 ( $c <= 50 || ( $c > 50 && mt_rand( 0, (int) ( $c / 50 ) ) == 1 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $c <= 50 || ( $c > 50 && mt_rand( 0, (int) ( $c / 50 ) ) === 1 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . WPINC . '/http.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_get(
</span><span class="cx" style="display: block; padding: 0 10px"> admin_url( 'upgrade.php?step=1' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,7 +181,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $page_hook = get_plugin_page_hook( $plugin_page, $plugin_page );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Back-compat for plugins using add_management_page().
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook( $plugin_page, 'tools.php' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $page_hook ) && 'edit.php' === $pagenow && '' !== get_plugin_page_hook( $plugin_page, 'tools.php' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // There could be plugin specific params on the URL, so we need the whole query string.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_SERVER['QUERY_STRING'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $query_string = $_SERVER['QUERY_STRING'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -370,16 +370,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * The following hooks are fired to ensure backward compatibility.
</span><span class="cx" style="display: block; padding: 0 10px"> * In all other cases, 'load-' . $pagenow should be used instead.
</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 ( $typenow == 'page' ) {
- if ( $pagenow == 'post-new.php' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'page' === $typenow ) {
+ if ( 'post-new.php' === $pagenow ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> do_action( 'load-page-new.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $pagenow == 'post.php' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'post.php' === $pagenow ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> do_action( 'load-page.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
</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 ( $pagenow == 'edit-tags.php' ) {
- if ( $taxnow == 'category' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'edit-tags.php' === $pagenow ) {
+ if ( 'category' === $taxnow ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> do_action( 'load-categories.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $taxnow == 'link_category' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'link_category' === $taxnow ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> do_action( 'load-edit-link-categories.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'term.php' === $pagenow ) {
</span></span></pre></div>
<a id="trunksrcwpadmininstallphp"></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/install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/install.php 2020-02-09 16:30:41 UTC (rev 47217)
+++ trunk/src/wp-admin/install.php 2020-02-09 16:51:22 UTC (rev 47218)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -369,7 +369,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // TODO: Poka-yoke.
</span><span class="cx" style="display: block; padding: 0 10px"> display_setup_form( __( 'Please provide a valid username.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $error = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $user_name != sanitize_user( $user_name, true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( sanitize_user( $user_name, true ) != $user_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> display_setup_form( __( 'The username you provided has invalid characters.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $error = true;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $admin_password != $admin_password_check ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -386,7 +386,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $error = 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 ( $error === false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false === $error ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->show_errors();
</span><span class="cx" style="display: block; padding: 0 10px"> $result = wp_install( $weblog_title, $user_name, $admin_email, $public, '', wp_slash( $admin_password ), $loaded_language );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span></span></pre></div>
<a id="trunksrcwpadminmediauploadphp"></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/media-upload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/media-upload.php 2020-02-09 16:30:41 UTC (rev 47217)
+++ trunk/src/wp-admin/media-upload.php 2020-02-09 16:51:22 UTC (rev 47218)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = isset( $post_id ) ? (int) $post_id : 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Require an ID for the edit screen.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( isset( $action ) && $action == 'edit' && ! $ID ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $action ) && 'edit' == $action && ! $ID ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><span class="cx" style="display: block; padding: 0 10px"> '<h1>' . __( 'Something went wrong.' ) . '</h1>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Invalid item ID.' ) . '</p>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,7 +81,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $body_id = 'media-upload';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Let the action code decide how to handle the request.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( $tab == 'type' || $tab == 'type_url' || ! array_key_exists( $tab, media_upload_tabs() ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( 'type' == $tab || 'type_url' == $tab || ! array_key_exists( $tab, media_upload_tabs() ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires inside specific upload-type views in the legacy (pre-3.5.0)
</span><span class="cx" style="display: block; padding: 0 10px"> * media popup based on the current tab.
</span></span></pre></div>
<a id="trunksrcwpadminmediaphp"></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/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/media.php 2020-02-09 16:30:41 UTC (rev 47217)
+++ trunk/src/wp-admin/media.php 2020-02-09 16:51:22 UTC (rev 47218)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,7 +69,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'attachment' !== $att->post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'You attempted to edit an item that isn’t an attachment. Please go back and try again.' ) );
</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 ( $att->post_status == 'trash' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'trash' == $att->post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'You can’t edit this attachment because it is in the Trash. Please move it out of the Trash and try again.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminmsdeletesitephp"></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/ms-delete-site.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/ms-delete-site.php 2020-02-09 16:30:41 UTC (rev 47217)
+++ trunk/src/wp-admin/ms-delete-site.php 2020-02-09 16:51:22 UTC (rev 47218)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,7 +17,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to delete this site.' ) );
</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( $_GET['h'] ) && $_GET['h'] != '' && get_option( 'delete_blog_hash' ) != false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $_GET['h'] ) && '' != $_GET['h'] && false != get_option( 'delete_blog_hash' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( hash_equals( get_option( 'delete_blog_hash' ), $_GET['h'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wpmu_delete_blog( get_current_blog_id() );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,7 +42,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="wrap">';
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<h1>' . esc_html( $title ) . '</h1>';
</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( $_POST['action'] ) && $_POST['action'] == 'deleteblog' && isset( $_POST['confirmdelete'] ) && $_POST['confirmdelete'] == '1' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $_POST['action'] ) && 'deleteblog' == $_POST['action'] && isset( $_POST['confirmdelete'] ) && '1' == $_POST['confirmdelete'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'delete-blog' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $hash = wp_generate_password( 20, false );
</span></span></pre></div>
<a id="trunksrcwpadminoptionsphp"></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/options.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options.php 2020-02-09 16:30:41 UTC (rev 47217)
+++ trunk/src/wp-admin/options.php 2020-02-09 16:51:22 UTC (rev 47218)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -335,7 +335,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $options as $option ) :
</span><span class="cx" style="display: block; padding: 0 10px"> $disabled = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $option->option_name == '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' == $option->option_name ) {
</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"> if ( is_serialized( $option->option_value ) ) {
</span></span></pre></div>
<a id="trunksrcwpadminpostphp"></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/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/post.php 2020-02-09 16:30:41 UTC (rev 47217)
+++ trunk/src/wp-admin/post.php 2020-02-09 16:51:22 UTC (rev 47218)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,8 +55,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sendback = wp_get_referer();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $sendback ||
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- strpos( $sendback, 'post.php' ) !== false ||
- strpos( $sendback, 'post-new.php' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ false !== strpos( $sendback, 'post.php' ) ||
+ false !== strpos( $sendback, 'post-new.php' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'attachment' == $post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $sendback = admin_url( 'upload.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,7 +160,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $submenu_file = 'upload.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $post_new_file = 'media-new.php';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $post_type_object ) && $post_type_object->show_in_menu && true !== $post_type_object->show_in_menu ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent_file = $post_type_object->show_in_menu;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_file = "edit.php?post_type=$post_type";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,7 +179,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $replace Whether to replace the editor. Default false.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Post $post Post object.
</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 ( apply_filters( 'replace_editor', false, $post ) === true ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( true === apply_filters( 'replace_editor', false, $post ) ) {
</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">@@ -309,7 +309,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to delete this item.' ) );
</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 ( $post->post_type == 'attachment' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'attachment' === $post->post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $force = ( ! MEDIA_TRASH );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! wp_delete_attachment( $post_id, $force ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Error in deleting.' ) );
</span></span></pre></div>
<a id="trunksrcwpadminupdatecorephp"></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/update-core.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/update-core.php 2020-02-09 16:30:41 UTC (rev 47217)
+++ trunk/src/wp-admin/update-core.php 2020-02-09 16:51:22 UTC (rev 47218)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,9 +42,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_version = get_bloginfo( 'version' );
</span><span class="cx" style="display: block; padding: 0 10px"> $version_string = sprintf( '%s–<strong>%s</strong>', $update->current, $update->locale );
</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 ( 'en_US' == $update->locale && 'en_US' == get_locale() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'en_US' === $update->locale && 'en_US' === get_locale() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $version_string = $update->current;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'en_US' == $update->locale && $update->packages->partial && $wp_version == $update->partial_version ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'en_US' === $update->locale && $update->packages->partial && $wp_version == $update->partial_version ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $updates = get_core_updates();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $updates && 1 == count( $updates ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If the only available update is a partial builds, it doesn't need a language-specific version string.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,7 +53,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"> $current = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! isset( $update->response ) || 'latest' == $update->response ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $update->response ) || 'latest' === $update->response ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $current = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $submit = __( 'Update Now' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,7 +61,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $php_version = phpversion();
</span><span class="cx" style="display: block; padding: 0 10px"> $mysql_version = $wpdb->db_version();
</span><span class="cx" style="display: block; padding: 0 10px"> $show_buttons = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'development' == $update->response ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'development' === $update->response ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'You are using a development version of WordPress. You can update to the latest nightly build automatically:' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $current ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,7 +153,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> submit_button( $submit, '', 'upgrade', false );
</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 ( 'en_US' != $update->locale ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'en_US' !== $update->locale ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $update->dismissed ) || ! $update->dismissed ) {
</span><span class="cx" style="display: block; padding: 0 10px"> submit_button( __( 'Hide this update' ), '', 'dismiss', false );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -161,14 +161,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"> echo '</p>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'en_US' != $update->locale && ( ! isset( $wp_local_package ) || $wp_local_package != $update->locale ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'en_US' !== $update->locale && ( ! isset( $wp_local_package ) || $wp_local_package != $update->locale ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<p class="hint">' . __( 'This localized version contains both the translation and various other localization fixes.' ) . '</p>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'en_US' == $update->locale && get_locale() != 'en_US' && ( ! $update->packages->partial && $wp_version == $update->partial_version ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'en_US' === $update->locale && 'en_US' !== get_locale() && ( ! $update->packages->partial && $wp_version == $update->partial_version ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Partial builds don't need language-specific warnings.
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p class="hint">' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: WordPress version. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'You are about to install WordPress %s <strong>in English (US).</strong> There is a chance this update will break your translation. You may prefer to wait for the localized version to be released.' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $update->response != 'development' ? $update->current : ''
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'development' !== $update->response ? $update->current : ''
</ins><span class="cx" style="display: block; padding: 0 10px"> ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</form>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,7 +225,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_version = get_bloginfo( 'version' );
</span><span class="cx" style="display: block; padding: 0 10px"> $updates = get_core_updates();
</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( $updates[0]->response ) || 'latest' == $updates[0]->response ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $updates[0]->response ) || 'latest' === $updates[0]->response ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<h2>';
</span><span class="cx" style="display: block; padding: 0 10px"> _e( 'You have the latest version of WordPress.' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,7 +256,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</h2>';
</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( $updates[0] ) && $updates[0]->response == 'development' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $updates[0] ) && 'development' === $updates[0]->response ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $upgrader = new WP_Automatic_Updater;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( wp_http_supports( 'ssl' ) && $upgrader->should_update( 'core', $updates[0], ABSPATH ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -274,7 +274,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</ul>';
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't show the maintenance mode notice when we are only showing a single re-install option.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $updates && ( count( $updates ) > 1 || $updates[0]->response != 'latest' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $updates && ( count( $updates ) > 1 || 'latest' !== $updates[0]->response ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<p>' . __( 'While your site is being updated, it will be in maintenance mode. As soon as your updates are complete, your site will return to normal.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! $updates ) {
</span><span class="cx" style="display: block; padding: 0 10px"> list( $normalized_version ) = explode( '-', $wp_version );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,7 +307,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $form_action = 'update-core.php?action=do-plugin-upgrade';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $core_updates = get_core_updates();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! isset( $core_updates[0]->response ) || 'latest' == $core_updates[0]->response || 'development' == $core_updates[0]->response || version_compare( $core_updates[0]->current, $cur_wp_version, '=' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $core_updates[0]->response ) || 'latest' === $core_updates[0]->response || 'development' === $core_updates[0]->response || version_compare( $core_updates[0]->current, $cur_wp_version, '=' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $core_update_version = false;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $core_update_version = $core_updates[0]->current;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -529,7 +529,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function list_translation_updates() {
</span><span class="cx" style="display: block; padding: 0 10px"> $updates = wp_get_translation_updates();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $updates ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'en_US' != get_locale() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'en_US' !== get_locale() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<h2>' . __( 'Translations' ) . '</h2>';
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p>' . __( 'Your translations are all up to date.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -692,7 +692,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $upgrade_error = false;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( 'do-theme-upgrade' == $action || ( 'do-plugin-upgrade' == $action && ! isset( $_GET['plugins'] ) ) )
</span><span class="cx" style="display: block; padding: 0 10px"> && ! isset( $_POST['checked'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $upgrade_error = $action == 'do-theme-upgrade' ? 'themes' : 'plugins';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $upgrade_error = 'do-theme-upgrade' == $action ? 'themes' : 'plugins';
</ins><span class="cx" style="display: block; padding: 0 10px"> $action = 'upgrade-core';
</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">@@ -713,7 +713,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $updates_howto = '<p>' . __( '<strong>WordPress</strong> — Updating your WordPress installation is a simple one-click procedure: just <strong>click on the “Update Now” button</strong> when you are notified that a new version is available.' ) . ' ' . __( 'In most cases, WordPress will automatically apply maintenance and security updates in the background for you.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> $updates_howto .= '<p>' . __( '<strong>Themes and Plugins</strong> — To update individual themes or plugins from this screen, use the checkboxes to make your selection, then <strong>click on the appropriate “Update” button</strong>. To update all of your themes or plugins at once, you can check the box at the top of the section to select all before clicking the update button.' ) . '</p>';
</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 ( 'en_US' != get_locale() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( 'en_US' !== get_locale() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $updates_howto .= '<p>' . __( '<strong>Translations</strong> — The files translating WordPress into your language are updated for you whenever any other updates occur. But if these files are out of date, you can <strong>click the “Update Translations”</strong> button.' ) . '</p>';
</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">@@ -743,7 +743,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $upgrade_error ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="error"><p>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $upgrade_error == 'themes' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'themes' === $upgrade_error ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _e( 'Please select one or more themes to update.' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> _e( 'Please select one or more plugins to update.' );
</span></span></pre></div>
<a id="trunksrcwpadminusernewphp"></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/user-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/user-new.php 2020-02-09 16:30:41 UTC (rev 47217)
+++ trunk/src/wp-admin/user-new.php 2020-02-09 16:51:22 UTC (rev 47218)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,7 +63,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect = 'user-new.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $username = $user_details->user_login;
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = $user_details->ID;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $username != null && array_key_exists( $blog_id, get_blogs_of_user( $user_id ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( null != $username && array_key_exists( $blog_id, get_blogs_of_user( $user_id ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $redirect = add_query_arg( array( 'update' => 'addexisting' ), 'user-new.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['noconfirmation'] ) && current_user_can( 'manage_network_users' ) ) {
</span></span></pre>
</div>
</div>
</body>
</html>