diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-09-24 16:24:13 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-09-24 16:24:13 +0200 |
| commit | abe8b78b65633b6942f57afbd263c7207821696b (patch) | |
| tree | a5364bca17a8c847fa0a60d5c99cd5708c851465 | |
| parent | 66575267c85ef469a134b1d2eab5275bf24c7a27 (diff) | |
| parent | 85a99cc6a386e49af7dc36f5450dce2338404851 (diff) | |
Merge pull request #488 from narfbg/ci-issue-89
Fix issue #89 - variable type mismatch in DB display_error()
| -rw-r--r-- | system/database/DB_driver.php | 2 | ||||
| -rw-r--r-- | user_guide/changelog.html | 1 |
2 files changed, 2 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 { 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> |