diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-01-20 12:04:10 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-01-20 12:04:10 +0100 |
| commit | 1ab62aedc09cc75ac5619d5e881076cc9ca5e090 (patch) | |
| tree | 400015ef7868e42d298fa42e1ea59130bf30adb9 /system/database/drivers | |
| parent | e35d7789a24e811bc147bc56c7a1d79904900b01 (diff) | |
Replaced AND with &&
Diffstat (limited to 'system/database/drivers')
| -rw-r--r-- | system/database/drivers/oci8/oci8_driver.php | 2 | ||||
| -rw-r--r-- | system/database/drivers/oci8/oci8_result.php | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index f4b899cf3..76aca9a66 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -471,7 +471,7 @@ class CI_DB_oci8_driver extends CI_DB { { $sql = 'SELECT TABLE_NAME FROM ALL_TABLES'; - if ($prefix_limit !== FALSE AND $this->dbprefix != '') + if ($prefix_limit !== FALSE && $this->dbprefix != '') { return $sql." WHERE TABLE_NAME LIKE '".$this->escape_like_str($this->dbprefix)."%' ".sprintf($this->_like_escape_str, $this->_like_escape_chr); } diff --git a/system/database/drivers/oci8/oci8_result.php b/system/database/drivers/oci8/oci8_result.php index 0e0fe059d..221ab2c5f 100644 --- a/system/database/drivers/oci8/oci8_result.php +++ b/system/database/drivers/oci8/oci8_result.php @@ -358,7 +358,6 @@ class CI_DB_oci8_result extends CI_DB_result { * @param string ('object', 'array' or a custom class name) * @return mixed whatever was passed to the second parameter */ - public function row($n = 0, $type = 'object') { if ($type === 'object') |