From e58a9c509b0a864aee583dd14a018a773dbc63e4 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 21 Jan 2009 21:27:09 +0000
Subject: Update Kohana to r3918

---
 kohana/libraries/drivers/Database/Mysqli.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'kohana/libraries/drivers/Database/Mysqli.php')

diff --git a/kohana/libraries/drivers/Database/Mysqli.php b/kohana/libraries/drivers/Database/Mysqli.php
index 206d42f2..795c576b 100644
--- a/kohana/libraries/drivers/Database/Mysqli.php
+++ b/kohana/libraries/drivers/Database/Mysqli.php
@@ -114,15 +114,18 @@ class Database_Mysqli_Driver extends Database_Mysql_Driver {
 
 	public function field_data($table)
 	{
-		$query  = $this->link->query('SHOW COLUMNS FROM '.$this->escape_table($table));
+		$columns = array();
+		$query = $this->link->query('SHOW COLUMNS FROM '.$this->escape_table($table));
 
-		$table  = array();
-		while ($row = $query->fetch_object())
+		if (is_object($query))
 		{
-			$table[] = $row;
+			while ($row = $query->fetch_object())
+			{
+				$columns[] = $row;
+			}
 		}
 
-		return $table;
+		return $columns;
 	}
 
 } // End Database_Mysqli_Driver Class
-- 
cgit v1.2.3