Ticket #45299: 45299.2.diff

src/wp-includes/wp-db.php

@@ -2456 +2456 @@
 
                 $new_array = array();
                 // Extract the column values
-                for ( $i = 0, $j = count( $this->last_result ); $i < $j; $i++ ) {
-                        $new_array[$i] = $this->get_var( null, $x, $i );
+                if ( $this->last_result ) {
+                        for ( $i = 0, $j = count( $this->last_result ); $i < $j; $i++ ) {
+                                $new_array[ $i ] = $this->get_var( null, $x, $i );
+                        }
                 }
                 return $new_array;
         }
@@ -2497 +2499 @@
                 } elseif ( $output == OBJECT_K ) {
                         // Return an array of row objects with keys from column 1
                         // (Duplicates are discarded)
-                        foreach ( $this->last_result as $row ) {
-                                $var_by_ref = get_object_vars( $row );
-                                $key = array_shift( $var_by_ref );
-                                if ( ! isset( $new_array[ $key ] ) )
-                                        $new_array[ $key ] = $row;
+                        if ( $this->last_result ) {
+                                foreach ( $this->last_result as $row ) {
+                                        $var_by_ref = get_object_vars( $row );
+                                        $key = array_shift( $var_by_ref );
+                                        if ( ! isset( $new_array[ $key ] ) ) {
+                                                $new_array[ $key ] = $row;
+                                        }
+                                }
                         }
                         return $new_array;
                 } elseif ( $output == ARRAY_A || $output == ARRAY_N ) {