diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-02-09 16:30:06 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-02-09 16:30:06 +0100 |
| commit | c2804a3f3eb085abcc50e8df51085db7a94c18d2 (patch) | |
| tree | b53e8a2798a75fa4f92ee2cc3201635ce7df319a /system/database | |
| parent | f6600f840125eadf2366c2244f78ad95defb156b (diff) | |
| parent | db97fe561f03284a287c9a588ac1ff19a9f5e71d (diff) | |
Merge branch 'develop' into 'feature/encryption'
Diffstat (limited to 'system/database')
| -rw-r--r-- | system/database/drivers/mssql/mssql_driver.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index 0836fa802..49711fec9 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -311,7 +311,7 @@ class CI_DB_mssql_driver extends CI_DB { .' FROM '.$this->escape_identifiers('sysobjects') .' WHERE '.$this->escape_identifiers('type')." = 'U'"; - if ($prefix_limit !== FALSE AND $this->dbprefix !== '') + if ($prefix_limit !== FALSE && $this->dbprefix !== '') { $sql .= ' AND '.$this->escape_identifiers('name')." LIKE '".$this->escape_like_str($this->dbprefix)."%' " .sprintf($this->_like_escape_str, $this->_like_escape_chr); |