diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-09-26 15:45:20 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-09-26 15:45:20 +0000 |
| commit | 28781ebb081ab8d99b30a33f5cd911b3b050bcc9 (patch) | |
| tree | f21e6b7d3dd06002c58dd52ae2eae10d64d62d85 /wp-includes/wp-db.php | |
| parent | cbd939114d362bfece3839d7d5d5e07367fd6be8 (diff) | |
| download | wordpress-mu-28781ebb081ab8d99b30a33f5cd911b3b050bcc9.tar.gz wordpress-mu-28781ebb081ab8d99b30a33f5cd911b3b050bcc9.tar.xz wordpress-mu-28781ebb081ab8d99b30a33f5cd911b3b050bcc9.zip | |
WP Merge to rev 4254
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@770 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/wp-db.php')
| -rw-r--r-- | wp-includes/wp-db.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php index d02606b..f543099 100644 --- a/wp-includes/wp-db.php +++ b/wp-includes/wp-db.php @@ -283,6 +283,9 @@ class wpdb { $this->func_call = "\$db->get_row(\"$query\",$output,$y)"; if ( $query ) $this->query($query); + + if ( !isset($this->last_result[$y]) ) + return null; if ( $output == OBJECT ) { return $this->last_result[$y] ? $this->last_result[$y] : null; @@ -433,5 +436,6 @@ class wpdb { } } -$wpdb = new wpdb(DB_USER, DB_PASSWORD, DB_NAME, DB_HOST); +if ( ! isset($wpdb) ) + $wpdb = new wpdb(DB_USER, DB_PASSWORD, DB_NAME, DB_HOST); ?> |