diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-01 13:43:04 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-01 13:43:04 +0100 |
| commit | 7ccb7ecc8e84f8e4f4cdf5ed10247f4350c7ec34 (patch) | |
| tree | c070c13151562383c3f65507ca27d4153f50827a /system/database | |
| parent | 18c9ea77c7c68be38ea1b995cccff18ee2e6acb4 (diff) | |
| parent | c2905f5884a7d9cd9ae1f70cdc615a5d214652dd (diff) | |
Merge upstream branch
Diffstat (limited to 'system/database')
| -rw-r--r-- | system/database/DB_active_rec.php | 3 | ||||
| -rw-r--r-- | system/database/drivers/oci8/oci8_driver.php | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 424735157..eaae23f30 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -236,7 +236,8 @@ class CI_DB_active_record extends CI_DB_driver { { if (strpos($item, '.') !== FALSE) { - return end(explode('.', $item)); + $item = explode('.', $item); + return end($item); } return $item; diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index 007e56a0b..ba53178b8 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -477,7 +477,7 @@ class CI_DB_oci8_driver extends CI_DB { // escape LIKE condition wildcards if ($like === TRUE) { - return str_replace(array($this->_like_escape_chr.$this->_like_escape_chr, '%', '_'), + 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); } |