Ticket #48455: 48455.1.patch

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 );
                         ?>

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.

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.' ) );
                 }
 

ms-delete-site.php

@@ -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'] ) && $_POST['confirmdelete'] == '1' ) {
         check_admin_referer( 'delete-blog' );
 
         $hash = wp_generate_password( 20, false );

options.php

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

post.php

@@ -301 +301 @@
                         wp_die( __( 'Sorry, you are not allowed to delete this item.' ) );
                 }
 
-                if ( $post->post_type == 'attachment' ) {
+                if ( 'attachment' == $post->post_type ) {
                         $force = ( ! MEDIA_TRASH );
                         if ( ! wp_delete_attachment( $post_id, $force ) ) {
                                 wp_die( __( 'Error in deleting.' ) );

update-core.php

@@ -164 +164 @@
                 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>';
@@ -252 +252 @@
                 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 ) ) {
@@ -688 +688 @@
 $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';
 }
 
@@ -739 +739 @@
         <?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.' );

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' ) ) {