diff options
| author | Brennan Thompson <brenjt@gmail.com> | 2014-02-14 20:03:57 +0100 |
|---|---|---|
| committer | Brennan Thompson <brenjt@gmail.com> | 2014-02-14 20:03:57 +0100 |
| commit | 6949f95f6e21980f36095490bf38fc8a172dbc0f (patch) | |
| tree | b3141f390acd0051396cda6a3da51c1f98384cca /system/database/drivers/mssql/mssql_driver.php | |
| parent | 68a02a01a086bbb1b8128ea2744439de84873d11 (diff) | |
| parent | 81f036753272391360ba5b64e6dd93c4101a8733 (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop
Conflicts:
system/helpers/form_helper.php
Diffstat (limited to 'system/database/drivers/mssql/mssql_driver.php')
| -rw-r--r-- | system/database/drivers/mssql/mssql_driver.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php index 0836fa802..655aa7148 100644 --- a/system/database/drivers/mssql/mssql_driver.php +++ b/system/database/drivers/mssql/mssql_driver.php @@ -18,7 +18,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2013, EllisLab, Inc. (http://ellislab.com/) + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/) * @license http://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) * @link http://codeigniter.com * @since Version 1.0 @@ -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); |