summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-11-09 13:05:02 +0100
committerAndrey Andreev <narf@devilix.net>2015-11-09 13:06:28 +0100
commit39105007580edc46bffe8f628e6bef91a9f4dd04 (patch)
tree5cdbb27175c4a8e2a7c818c1aef7d74256139597 /system/database
parent2fe1a2389aa13c3acde7fb42ab35e79504e89f75 (diff)
Merge pull request #4223 from j0inty/develop
CI_DB_driver->simple_query() to check initialize() return value
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_driver.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 0ea679432..25e70ec3f 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -774,7 +774,10 @@ abstract class CI_DB_driver {
{
if ( ! $this->conn_id)
{
- $this->initialize();
+ if ( ! $this->initialize())
+ {
+ return FALSE;
+ }
}
return $this->_execute($sql);