diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-03-01 15:40:37 +0100 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-03-01 15:40:37 +0100 |
| commit | a0da0b28bdb0ff73d5c0d9f8780ab0f6d74f39e3 (patch) | |
| tree | 67b3789312fb4056352d83432c60644648c9feac /system/database/drivers/oci8 | |
| parent | 7842b1bc8cc007521dcc55de613d6e3224cfe2c1 (diff) | |
| parent | ed7408282e9fded97ade222f98b43623a0f17d22 (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into firebird
Diffstat (limited to 'system/database/drivers/oci8')
| -rw-r--r-- | system/database/drivers/oci8/oci8_driver.php | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index c6621901b..057095c23 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -398,10 +398,9 @@ class CI_DB_oci8_driver extends CI_DB { /** * Escape String * - * @access public - * @param string + * @param string * @param bool whether or not the string will be used in a LIKE condition - * @return string + * @return string */ public function escape_str($str, $like = FALSE) { @@ -415,15 +414,14 @@ class CI_DB_oci8_driver extends CI_DB { return $str; } - $str = remove_invisible_characters($str); - $str = str_replace("'", "''", $str); + $str = str_replace("'", "''", remove_invisible_characters($str)); // 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); + return 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; |