Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-13 22:26:06 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13671 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2010-03-11 21:30:29 +00:00
parent da3765da55
commit bb2fb8cb34
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wp-includes/wp-db.php
View File

@ -444,6 +444,15 @@ class wpdb {
*/ */
var $dbuser; var $dbuser;
/**
* A textual description of the last query/get_row/get_var call
*
* @since unknown
* @access public
* @var string
*/
var $func_call;
/** /**
* Connects to the database server and selects a database * Connects to the database server and selects a database
* *
@ -1387,20 +1396,19 @@ class wpdb {
} elseif ( $output == ARRAY_A || $output == ARRAY_N ) { } elseif ( $output == ARRAY_A || $output == ARRAY_N ) {
// Return an integer-keyed array of... // Return an integer-keyed array of...
if ( $this->last_result ) { if ( $this->last_result ) {
$i = 0;
foreach( (array) $this->last_result as $row ) { foreach( (array) $this->last_result as $row ) {
if ( $output == ARRAY_N ) { if ( $output == ARRAY_N ) {
// ...integer-keyed row arrays // ...integer-keyed row arrays
$new_array[$i] = array_values( get_object_vars( $row ) ); $new_array[] = array_values( get_object_vars( $row ) );
} else { } else {
// ...column name-keyed row arrays // ...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;
} }
/** /**