summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-09-24 16:24:13 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-09-24 16:24:13 +0200
commitabe8b78b65633b6942f57afbd263c7207821696b (patch)
treea5364bca17a8c847fa0a60d5c99cd5708c851465 /system/database
parent66575267c85ef469a134b1d2eab5275bf24c7a27 (diff)
parent85a99cc6a386e49af7dc36f5450dce2338404851 (diff)
Merge pull request #488 from narfbg/ci-issue-89
Fix issue #89 - variable type mismatch in DB display_error()
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_driver.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 12c0530c5..17649f7b1 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -1166,7 +1166,7 @@ class CI_DB_driver {
if ($native == TRUE)
{
- $message = $error;
+ $message = (array) $error;
}
else
{