summaryrefslogtreecommitdiff
path: root/system/libraries/Database_Mysqli_Result.php
diff options
context:
space:
mode:
authorNathan Kinkade <nkinkade@nkinka.de>2010-01-09 23:02:55 +0000
committerNathan Kinkade <nkinkade@nkinka.de>2010-01-09 23:02:55 +0000
commit0a67b836a9b5021c91b9c327d3693991c3248dfc (patch)
tree91f49ca62a9ffd586e01bde700068f87e884181a /system/libraries/Database_Mysqli_Result.php
parent232c0b7fd0df7f84543bc29380a0734ef1e84a02 (diff)
parentbd9f945e3f2de4ea2402bd3941dba69c79ddc5a4 (diff)
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'system/libraries/Database_Mysqli_Result.php')
-rw-r--r--system/libraries/Database_Mysqli_Result.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/system/libraries/Database_Mysqli_Result.php b/system/libraries/Database_Mysqli_Result.php
index 3601aeac..f8b7b588 100644
--- a/system/libraries/Database_Mysqli_Result.php
+++ b/system/libraries/Database_Mysqli_Result.php
@@ -2,8 +2,6 @@
/**
* MySQL database result.
*
- * $Id: Database_Mysqli_Result.php 4679 2009-11-10 01:45:52Z isaiah $
- *
* @package Kohana
* @author Kohana Team
* @copyright (c) 2008-2009 Kohana Team
@@ -29,7 +27,7 @@ class Database_Mysqli_Result_Core extends Database_Result {
throw new Database_Exception('#:errno: :error [ :query ]',
array(':error' => $link->error,
':query' => $sql,
- ':errno' => $link->errno));
+ ':errno' => $link->errno));
}
else
{