Ticket #49453: 49453.patch

wp-db.php

@@ -967 +967 @@
                                 $blog_id = $this->blogid;
                         }
                         $blog_id = (int) $blog_id;
-                        if ( defined( 'MULTISITE' ) && ( 0 == $blog_id || 1 == $blog_id ) ) {
+                        if ( defined( 'MULTISITE' ) && ( 0 === $blog_id || 1 === $blog_id ) ) {
                                 return $this->base_prefix;
                         } else {
                                 return $this->base_prefix . $blog_id . '_';
@@ -1307 +1307 @@
 
                 // If args were passed as an array (as in vsprintf), move them up.
                 $passed_as_array = false;
-                if ( is_array( $args[0] ) && count( $args ) == 1 ) {
+                if ( is_array( $args[0] ) && count( $args ) === 1 ) {
                         $passed_as_array = true;
                         $args            = $args[0];
                 }
@@ -1931 +1931 @@
                         }
                 }
 
-                if ( empty( $this->dbh ) || 2006 == $mysql_errno ) {
+                if ( empty( $this->dbh ) || 2006 === $mysql_errno ) {
                         if ( $this->check_connection() ) {
                                 $this->_do_query( $query );
                         } else {
@@ -2569 +2569 @@
                         return null;
                 }
 
-                if ( OBJECT == $output ) {
+                if ( OBJECT === $output ) {
                         return $this->last_result[ $y ] ? $this->last_result[ $y ] : null;
-                } elseif ( ARRAY_A == $output ) {
+                } elseif ( ARRAY_A === $output ) {
                         return $this->last_result[ $y ] ? get_object_vars( $this->last_result[ $y ] ) : null;
-                } elseif ( ARRAY_N == $output ) {
+                } elseif ( ARRAY_N === $output ) {
                         return $this->last_result[ $y ] ? array_values( get_object_vars( $this->last_result[ $y ] ) ) : null;
                 } elseif ( OBJECT === strtoupper( $output ) ) {
                         // Back compat for OBJECT being previously case-insensitive.
@@ -2644 +2644 @@
                 }
 
                 $new_array = array();
-                if ( OBJECT == $output ) {
+                if ( OBJECT === $output ) {
                         // Return an integer-keyed array of row objects.
                         return $this->last_result;
-                } elseif ( OBJECT_K == $output ) {
+                } elseif ( OBJECT_K === $output ) {
                         // Return an array of row objects with keys from column 1.
                         // (Duplicates are discarded.)
                         if ( $this->last_result ) {
@@ -2660 +2660 @@
                                 }
                         }
                         return $new_array;
-                } elseif ( ARRAY_A == $output || ARRAY_N == $output ) {
+                } elseif ( ARRAY_A === $output || ARRAY_N === $output ) {
                         // Return an integer-keyed array of...
                         if ( $this->last_result ) {
                                 foreach ( (array) $this->last_result as $row ) {
-                                        if ( ARRAY_N == $output ) {
+                                        if ( ARRAY_N === $output ) {
                                                 // ...integer-keyed row arrays.
                                                 $new_array[] = array_values( get_object_vars( $row ) );
                                         } else {
@@ -3373 +3373 @@
                 $this->load_col_info();
 
                 if ( $this->col_info ) {
-                        if ( -1 == $col_offset ) {
+                        if ( -1 === $col_offset ) {
                                 $i         = 0;
                                 $new_array = array();
                                 foreach ( (array) $this->col_info as $col ) {