summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-03-25 12:04:12 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-03-25 12:04:12 +0100
commita955803ba49ca0b58c3634f800962ca49068ea81 (patch)
tree7ec2ad43f73d59c41ddc98d8183261f42927625a /system/database
parentaf6f34489a9dc6b22cc9fe02eb53e13014ced38f (diff)
parent64f96e3a96878bbddfc01960cbde12957f243d6e (diff)
Fixed merge.
Diffstat (limited to 'system/database')
-rw-r--r--system/database/drivers/mssql/mssql_driver.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php
index 5048c0b4a..b581a478c 100644
--- a/system/database/drivers/mssql/mssql_driver.php
+++ b/system/database/drivers/mssql/mssql_driver.php
@@ -267,9 +267,9 @@ class CI_DB_mssql_driver extends CI_DB {
// escape LIKE condition wildcards
if ($like === TRUE)
{
- $str = str_replace( array('%', '_', $this->_like_escape_chr),
- array($this->_like_escape_chr.'%', $this->_like_escape_chr.'_', $this->_like_escape_chr.$this->_like_escape_chr),
- $str);
+ $str = str_replace( array('%', $this->_like_escape_chr, '_'),
+ array($this->_like_escape_chr.'%', $this->_like_escape_chr.$this->_like_escape_chr, $this->_like_escape_chr.'_'),
+ $str);
}
return $str;