Ticket #10607: 10607.patch

wp-includes/wp-db.php

@@ -445 +445 @@
         var $dbuser;
 
         /**
+         * {@internal Missing Description}}
+         *
+         * @since unknown
+         * @access public
+         * @var unknown
+         */
+        var $func_call;
+
+        /**
          * Connects to the database server and selects a database
          *
          * PHP4 compatibility layer for calling the PHP5 constructor.
@@ -1387 +1396 @@
                 } elseif ( $output == ARRAY_A || $output == ARRAY_N ) {
                         // 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;
         }
 
         /**