diff options
| author | Chad Kieffer <ckieffer@gmail.com> | 2009-07-21 19:40:48 -0600 |
|---|---|---|
| committer | Chad Kieffer <ckieffer@gmail.com> | 2009-07-21 19:40:48 -0600 |
| commit | 63511316be51f193d37c4f3b9dd3455a9ab60de8 (patch) | |
| tree | 74986ed982d37b06256d5d2501d609314ba52e4e /system/libraries/Database.php | |
| parent | 7f9e71d8cdcf99267adc2b4a6332e379a0fca0fc (diff) | |
| parent | f533aee1cc71e8db739406859ac0cf43dce030ec (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'system/libraries/Database.php')
| -rw-r--r-- | system/libraries/Database.php | 9 |
1 files changed, 7 insertions, 2 deletions
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; } /** |