Changeset 13671

Timestamp:

03/11/2010 09:30:29 PM (15 years ago)

Author:

westi

Message:

Ensure that wpdb::get_results() always returns an array when it should. Fixes #10607 props miqrogroove.

File:

• trunk/wp-includes/wp-db.php (modified) (2 diffs)

trunk/wp-includes/wp-db.php

@@ -444 +444 @@
      */
     var $dbuser;
+
+    /**
+     * A textual description of the last query/get_row/get_var call
+     *
+     * @since unknown
+     * @access public
+     * @var string
+     */
+    var $func_call;
 
     /**
@@ -1388 +1397 @@
             // Return an integer-keyed array of...
             if ( $this->last_result ) {
-                $i = 0;
                 foreach( (array) $this->last_result as $row ) {
                     if ( $output == ARRAY_N ) {
                         // ...integer-keyed row arrays
-                        $new_array[$i] = array_values( get_object_vars( $row ) );
+                        $new_array[] = array_values( get_object_vars( $row ) );
                     } else {
                         // ...column name-keyed row arrays
-                        $new_array[$i] = get_object_vars( $row );
+                        $new_array[] = get_object_vars( $row );
                     }
-                    ++$i;
                 }
-                return $new_array;
             }
-        }
+            return $new_array;
+        }
+        return null;
     }