diff options
| author | Andrew <browner12@gmail.com> | 2014-02-11 09:55:48 +0100 |
|---|---|---|
| committer | Andrew <browner12@gmail.com> | 2014-02-11 09:55:48 +0100 |
| commit | b6d8b962e44202a74c9b9321a4a53f61a753fccf (patch) | |
| tree | 2d3c533a55964a0d124f7cd6bb1d3d98c7b84056 /system/database/drivers | |
| parent | 41713aaa665189dd0a191c333c73c4a7b9f37c78 (diff) | |
| parent | 29e12641a1bb952f493462db6757ae12c7da1f2c (diff) | |
Merge branch 'develop' into patch-1
Conflicts:
system/libraries/Calendar.php
Diffstat (limited to 'system/database/drivers')
| -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); |