Ticket #21870: 21870.2.diff

wp-includes/wp-db.php

@@ -1192 +1192 @@
                 if ( defined( 'SAVEQUERIES' ) && SAVEQUERIES )
                         $this->timer_start();
 
-                $this->result = @mysql_query( $query, $this->dbh );
+                $this->result = mysql_query( $query, $this->dbh );
                 $this->num_queries++;
 
                 if ( defined( 'SAVEQUERIES' ) && SAVEQUERIES )
@@ -1216 +1216 @@
                         $return_val = $this->rows_affected;
                 } else {
                         $num_rows = 0;
-                        while ( $row = @mysql_fetch_object( $this->result ) ) {
-                                $this->last_result[$num_rows] = $row;
-                                $num_rows++;
+                        if ( is_resource( $this->result ) ) {
+                                while ( $row = mysql_fetch_object( $this->result ) ) {
+                                        $this->last_result[$num_rows] = $row;
+                                        $num_rows++;
+                                }
                         }
 
                         // Log number of rows the query returned
@@ -1556 +1558 @@
          * @access protected
          */
         protected function load_col_info() {
-                if ( $this->col_info )
+                if ( $this->col_info || ! is_resource( $this->result ) )
                         return;
 
-                for ( $i = 0; $i < @mysql_num_fields( $this->result ); $i++ ) {
-                        $this->col_info[ $i ] = @mysql_fetch_field( $this->result, $i );
+                for ( $i = 0; $i < mysql_num_fields( $this->result ); $i++ ) {
+                        $this->col_info[ $i ] = mysql_fetch_field( $this->result, $i );
                 }
         }