diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-11-09 13:05:02 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-11-09 13:05:02 +0100 |
| commit | 035c21accc6831ac6bf64151afcdf80ca68b0367 (patch) | |
| tree | 50280822f99eac2b7ab8711787fad816b42f53d2 /system/database | |
| parent | f89e69ce1fb4eec3001d7ff8dcc8ce9e398ed9c2 (diff) | |
| parent | cebb13b988e0e4d352d90170e064d1affbcf1697 (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.php | 5 |
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); |