summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2011-09-24 16:09:44 +0200
committerAndrey Andreev <narf@bofh.bg>2011-09-24 16:09:44 +0200
commit89e1780f16ea91e913d4231ec07b90391622c8cb (patch)
tree94b627d3913353eab8a0642221801b8da5c1b07e
parent66575267c85ef469a134b1d2eab5275bf24c7a27 (diff)
Fix a variable type mismatch (issue #89) in system/database/DB_driver.php
-rw-r--r--system/database/DB_driver.php2
-rw-r--r--user_guide/changelog.html1
2 files changed, 2 insertions, 1 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 12c0530c5..31e4c2bca 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 = ( ! is_array($error)) ? array($error) : $error;
}
else
{
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 50875abf1..0afdbe4a1 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -133,6 +133,7 @@ Change Log
<li>Fixed a bug (#112) - OCI8 (Oracle) driver didn't pass the configured database character set when connecting.</li>
<li>Fixed a bug (#182) - OCI8 (Oracle) driver used to re-execute the statement whenever num_rows() is called.</li>
<li>Fixed a bug (#82) - WHERE clause field names in the DB <samp>update_string()</samp> method were not escaped, resulting in failed queries in some cases.</li>
+ <li>Fixed a bug (#89) - Fix a variable type mismatch in DB <samp>display_error()</samp> where an array is expected, but a string could be set instead.</li>
</ul>
<h2>Version 2.0.3</h2>