Ticket #48455: 48455.2.patch

src/wp-admin/install.php

@@ -386 +386 @@
                         $error = true;
                 }
 
-                if ( $error === false ) {
+                if ( false === $error ) {
                         $wpdb->show_errors();
                         $result = wp_install( $weblog_title, $user_name, $admin_email, $public, '', wp_slash( $admin_password ), $loaded_language );
                         ?>

src/wp-admin/media-upload.php

@@ -33 +33 @@
 $post_id = isset( $post_id ) ? (int) $post_id : 0;
 
 // Require an ID for the edit screen.
-if ( isset( $action ) && $action == 'edit' && ! $ID ) {
+if ( isset( $action ) && 'edit' == $action && ! $ID ) {
         wp_die(
                 '<h1>' . __( 'Something went wrong.' ) . '</h1>' .
                 '<p>' . __( 'Invalid item ID.' ) . '</p>',
@@ -81 +81 @@
 $body_id = 'media-upload';
 
 // Let the action code decide how to handle the request.
-if ( $tab == 'type' || $tab == 'type_url' || ! array_key_exists( $tab, media_upload_tabs() ) ) {
+if ( 'type' == $tab || 'type_url' == $tab || ! array_key_exists( $tab, media_upload_tabs() ) ) {
         /**
          * Fires inside specific upload-type views in the legacy (pre-3.5.0)
          * media popup based on the current tab.

src/wp-admin/media.php

@@ -69 +69 @@
                 if ( 'attachment' !== $att->post_type ) {
                         wp_die( __( 'You attempted to edit an item that isn’t an attachment. Please go back and try again.' ) );
                 }
-                if ( $att->post_status == 'trash' ) {
+                if ( 'trash' == $att->post_status ) {
                         wp_die( __( 'You can’t edit this attachment because it is in the Trash. Please move it out of the Trash and try again.' ) );
                 }
 

src/wp-admin/ms-delete-site.php

@@ -17 +17 @@
         wp_die( __( 'Sorry, you are not allowed to delete this site.' ) );
 }
 
-if ( isset( $_GET['h'] ) && $_GET['h'] != '' && get_option( 'delete_blog_hash' ) != false ) {
+if ( isset( $_GET['h'] ) && '' != $_GET['h'] && false != get_option( 'delete_blog_hash' ) ) {
         if ( hash_equals( get_option( 'delete_blog_hash' ), $_GET['h'] ) ) {
                 wpmu_delete_blog( get_current_blog_id() );
                 wp_die(
@@ -42 +42 @@
 echo '<div class="wrap">';
 echo '<h1>' . esc_html( $title ) . '</h1>';
 
-if ( isset( $_POST['action'] ) && $_POST['action'] == 'deleteblog' && isset( $_POST['confirmdelete'] ) && $_POST['confirmdelete'] == '1' ) {
+if ( isset( $_POST['action'] ) && 'deleteblog' == $_POST['action'] && isset( $_POST['confirmdelete'] ) && '1' == $_POST['confirmdelete'] ) {
         check_admin_referer( 'delete-blog' );
 
         $hash = wp_generate_password( 20, false );

src/wp-admin/options.php

@@ -335 +335 @@
 
 foreach ( (array) $options as $option ) :
         $disabled = false;
-        if ( $option->option_name == '' ) {
+        if ( '' == $option->option_name ) {
                 continue;
         }
         if ( is_serialized( $option->option_value ) ) {

src/wp-admin/post.php

@@ -55 +55 @@
 
 $sendback = wp_get_referer();
 if ( ! $sendback ||
-        strpos( $sendback, 'post.php' ) !== false ||
-        strpos( $sendback, 'post-new.php' ) !== false ) {
+        false !== strpos( $sendback, 'post.php' ) ||
+        false !== strpos( $sendback, 'post-new.php' ) ) {
         if ( 'attachment' == $post_type ) {
                 $sendback = admin_url( 'upload.php' );
         } else {
@@ -160 +160 @@
                         $submenu_file  = 'upload.php';
                         $post_new_file = 'media-new.php';
                 } else {
-                        if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true ) {
+                        if ( isset( $post_type_object ) && $post_type_object->show_in_menu && true !== $post_type_object->show_in_menu ) {
                                 $parent_file = $post_type_object->show_in_menu;
                         } else {
                                 $parent_file = "edit.php?post_type=$post_type";
@@ -179 +179 @@
                  * @param bool    $replace Whether to replace the editor. Default false.
                  * @param WP_Post $post    Post object.
                  */
-                if ( apply_filters( 'replace_editor', false, $post ) === true ) {
+                if ( true === apply_filters( 'replace_editor', false, $post ) ) {
                         break;
                 }
 

src/wp-admin/update-core.php

@@ -163 +163 @@
         echo '</p>';
         if ( 'en_US' != $update->locale && ( ! isset( $wp_local_package ) || $wp_local_package != $update->locale ) ) {
                 echo '<p class="hint">' . __( 'This localized version contains both the translation and various other localization fixes.' ) . '</p>';
-        } elseif ( 'en_US' == $update->locale && get_locale() != 'en_US' && ( ! $update->packages->partial && $wp_version == $update->partial_version ) ) {
+        } elseif ( 'en_US' == $update->locale && 'en_US' != get_locale() && ( ! $update->packages->partial && $wp_version == $update->partial_version ) ) {
                 // Partial builds don't need language-specific warnings.
                 echo '<p class="hint">' . sprintf(
                         /* translators: %s: WordPress version. */
                         __( '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.' ),
-                        $update->response != 'development' ? $update->current : ''
+                        'development' != $update->response ? $update->current : ''
                 ) . '</p>';
         }
         echo '</form>';
@@ -256 +256 @@
                 echo '</h2>';
         }
 
-        if ( isset( $updates[0] ) && $updates[0]->response == 'development' ) {
+        if ( isset( $updates[0] ) && 'development' == $updates[0]->response ) {
                 require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
                 $upgrader = new WP_Automatic_Updater;
                 if ( wp_http_supports( 'ssl' ) && $upgrader->should_update( 'core', $updates[0], ABSPATH ) ) {
@@ -274 +274 @@
         }
         echo '</ul>';
         // Don't show the maintenance mode notice when we are only showing a single re-install option.
-        if ( $updates && ( count( $updates ) > 1 || $updates[0]->response != 'latest' ) ) {
+        if ( $updates && ( count( $updates ) > 1 || 'latest' != $updates[0]->response ) ) {
                 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>';
         } elseif ( ! $updates ) {
                 list( $normalized_version ) = explode( '-', $wp_version );
@@ -692 +692 @@
 $upgrade_error = false;
 if ( ( 'do-theme-upgrade' == $action || ( 'do-plugin-upgrade' == $action && ! isset( $_GET['plugins'] ) ) )
         && ! isset( $_POST['checked'] ) ) {
-        $upgrade_error = $action == 'do-theme-upgrade' ? 'themes' : 'plugins';
+        $upgrade_error = 'do-theme-upgrade' == $action ? 'themes' : 'plugins';
         $action        = 'upgrade-core';
 }
 
@@ -743 +743 @@
         <?php
         if ( $upgrade_error ) {
                 echo '<div class="error"><p>';
-                if ( $upgrade_error == 'themes' ) {
+                if ( 'themes' == $upgrade_error ) {
                         _e( 'Please select one or more themes to update.' );
                 } else {
                         _e( 'Please select one or more plugins to update.' );

src/wp-admin/user-new.php

@@ -63 +63 @@
         $redirect       = 'user-new.php';
         $username       = $user_details->user_login;
         $user_id        = $user_details->ID;
-        if ( $username != null && array_key_exists( $blog_id, get_blogs_of_user( $user_id ) ) ) {
+        if ( null != $username && array_key_exists( $blog_id, get_blogs_of_user( $user_id ) ) ) {
                 $redirect = add_query_arg( array( 'update' => 'addexisting' ), 'user-new.php' );
         } else {
                 if ( isset( $_POST['noconfirmation'] ) && current_user_can( 'manage_network_users' ) ) {