From 2572e5810f9d66fa39fa97838818a25bf4f393f3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 21 Jul 2009 07:29:14 -0700
Subject: Updated Kohana to r4468

---
 system/libraries/Database.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'system')

diff --git a/system/libraries/Database.php b/system/libraries/Database.php
index 6267f63a..2039371c 100644
--- a/system/libraries/Database.php
+++ b/system/libraries/Database.php
@@ -2,7 +2,7 @@
 /**
  * Provides database access in a platform agnostic way, using simple query building blocks.
  *
- * $Id: Database.php 4342 2009-05-08 16:56:01Z jheathco $
+ * $Id: Database.php 4438 2009-07-06 04:11:16Z kiall $
  *
  * @package    Core
  * @author     Kohana Team
@@ -1144,7 +1144,12 @@ class Database_Core {
 
 		$query = $this->select('COUNT(*) AS '.$this->escape_column('records_found'))->get()->result(TRUE);
 
-		return (int) $query->current()->records_found;
+		$query = $query->current();
+		
+		if ( ! $query)
+			return 0;
+		else
+			return (int) $query->records_found;
 	}
 
 	/**
-- 
cgit v1.2.3