| commit | 39105007580edc46bffe8f628e6bef91a9f4dd04 | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@devilix.net> | Mon Nov 09 14:05:02 2015 +0200 |
| committer | Andrey Andreev <narf@devilix.net> | Mon Nov 09 14:06:28 2015 +0200 |
| tree | 5cdbb27175c4a8e2a7c818c1aef7d74256139597 | |
| parent | 2fe1a2389aa13c3acde7fb42ab35e79504e89f75 [diff] [blame] |
Merge pull request #4223 from j0inty/develop CI_DB_driver->simple_query() to check initialize() return value
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 0ea6794..25e70ec 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php
@@ -774,7 +774,10 @@ { if ( ! $this->conn_id) { - $this->initialize(); + if ( ! $this->initialize()) + { + return FALSE; + } } return $this->_execute($sql);