summaryrefslogtreecommitdiffstats
path: root/system/database/DB_driver.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2011-10-04 17:13:52 +0200
committerAndrey Andreev <narf@bofh.bg>2011-10-04 17:13:52 +0200
commit79edb997be293e997afc5e008125bf334855f4d4 (patch)
tree742c7065c8fa55fdcce26652bc82d52976554c8a /system/database/DB_driver.php
parent2cec39f2c221d2acab5dbd830b6dd64db01b24d9 (diff)
parent0f614c692eb2db49da98b8eca6247bd8c245a64e (diff)
Merge upstream changes
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 300ca2977..17649f7b1 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 */