summaryrefslogtreecommitdiffstats
path: root/system/database/DB_driver.php
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2011-09-28 16:47:42 +0200
committerTimothy Warren <tim@timshomepage.net>2011-09-28 16:47:42 +0200
commita0cd41c5187c738d043ca5a0dc5fbf80806fd322 (patch)
tree75f145aeb7466dc150a2faf8764174234b48c47b /system/database/DB_driver.php
parent4d292bdb56ba6afc26878d9bcd82892f48d9f1a4 (diff)
parent5a3284edd6f3de5871804c7e24a9d74e57b2b7a6 (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/database/DB_driver.php')
-rw-r--r--system/database/DB_driver.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index f3c6e41ad..237a4fcea 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -950,6 +950,7 @@ class CI_DB_driver {
foreach ($where as $key => $val)
{
$prefix = (count($dest) == 0) ? '' : ' AND ';
+ $key = $this->_protect_identifiers($key);
if ($val !== '')
{
@@ -1165,7 +1166,7 @@ class CI_DB_driver {
if ($native == TRUE)
{
- $message = $error;
+ $message = (array) $error;
}
else
{
@@ -1390,4 +1391,4 @@ class CI_DB_driver {
/* End of file DB_driver.php */
-/* Location: ./system/database/DB_driver.php */ \ No newline at end of file
+/* Location: ./system/database/DB_driver.php */