From 5dfab7711fa3adca6f9e4f45d4a4691d9c0dd8e9 Mon Sep 17 00:00:00 2001
From: Matt Mullenweg <matt@git.wordpress.org>
Date: Fri, 10 Aug 2007 01:33:56 +0000
Subject: [PATCH] If you don't have anything nice to say, don't say anything at
 all. (And certainly don't return the results of a previous query to an empty
 query.)

git-svn-id: https://develop.svn.wordpress.org/trunk@5858 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/wp-db.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
index 5317dbde55..134735cfba 100644
--- a/wp-includes/wp-db.php
+++ b/wp-includes/wp-db.php
@@ -260,6 +260,8 @@ class wpdb {
 		$this->func_call = "\$db->get_var(\"$query\",$x,$y)";
 		if ( $query )
 			$this->query($query);
+		else
+			return null;
 
 		// Extract var out of cached results based x,y vals
 		if ( $this->last_result[$y] ) {
@@ -281,6 +283,8 @@ class wpdb {
 		$this->func_call = "\$db->get_row(\"$query\",$output,$y)";
 		if ( $query )
 			$this->query($query);
+		else
+			return null;
 
 		if ( !isset($this->last_result[$y]) )
 			return null;
@@ -305,6 +309,8 @@ class wpdb {
 	function get_col($query = null , $x = 0) {
 		if ( $query )
 			$this->query($query);
+		else
+			return null;
 
 		// Extract the column values
 		for ( $i=0; $i < count($this->last_result); $i++ ) {
@@ -324,6 +330,8 @@ class wpdb {
 
 		if ( $query )
 			$this->query($query);
+		else
+			return null;
 
 		// Send back array of objects. Each row is an object
 		if ( $output == OBJECT ) {