From 54e648b7bc65ea36a519f0a7b4407106e4f2756d Mon Sep 17 00:00:00 2001 From: Gwenael Gallon Date: Sun, 8 Feb 2015 00:18:28 +0100 Subject: Revert "Remove unnecessary return" This reverts commit 843d2506e1a1eab17b871bc38b204d27047c9ff7. --- system/database/drivers/cubrid/cubrid_driver.php | 2 +- system/database/drivers/ibase/ibase_driver.php | 2 +- system/database/drivers/mysql/mysql_driver.php | 2 +- system/database/drivers/mysqli/mysqli_driver.php | 2 +- system/database/drivers/oci8/oci8_driver.php | 2 +- system/database/drivers/odbc/odbc_driver.php | 2 +- system/database/drivers/postgre/postgre_driver.php | 2 +- system/database/drivers/sqlite/sqlite_driver.php | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'system') diff --git a/system/database/drivers/cubrid/cubrid_driver.php b/system/database/drivers/cubrid/cubrid_driver.php index 74b8d99c4..402117978 100644 --- a/system/database/drivers/cubrid/cubrid_driver.php +++ b/system/database/drivers/cubrid/cubrid_driver.php @@ -318,7 +318,7 @@ class CI_DB_cubrid_driver extends CI_DB { if ($prefix_limit !== FALSE && $this->dbprefix !== '') { - $sql ." LIKE '".$this->escape_like_str($this->dbprefix)."%'"; + return $sql." LIKE '".$this->escape_like_str($this->dbprefix)."%'"; } return $sql; diff --git a/system/database/drivers/ibase/ibase_driver.php b/system/database/drivers/ibase/ibase_driver.php index fa04ad5ca..529c320cd 100644 --- a/system/database/drivers/ibase/ibase_driver.php +++ b/system/database/drivers/ibase/ibase_driver.php @@ -234,7 +234,7 @@ class CI_DB_ibase_driver extends CI_DB { if ($prefix_limit !== FALSE && $this->dbprefix !== '') { - $sql .' AND TRIM("RDB$RELATION_NAME") AS TABLE_NAME LIKE \''.$this->escape_like_str($this->dbprefix)."%' " + return $sql.' AND TRIM("RDB$RELATION_NAME") AS TABLE_NAME LIKE \''.$this->escape_like_str($this->dbprefix)."%' " .sprintf($this->_like_escape_str, $this->_like_escape_chr); } diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index d571c45c6..f8e9b6d61 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -390,7 +390,7 @@ class CI_DB_mysql_driver extends CI_DB { if ($prefix_limit !== FALSE && $this->dbprefix !== '') { - $sql ." LIKE '".$this->escape_like_str($this->dbprefix)."%'"; + return $sql." LIKE '".$this->escape_like_str($this->dbprefix)."%'"; } return $sql; diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index 82c043427..22a8ba678 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -375,7 +375,7 @@ class CI_DB_mysqli_driver extends CI_DB { if ($prefix_limit !== FALSE && $this->dbprefix !== '') { - $sql ." LIKE '".$this->escape_like_str($this->dbprefix)."%'"; + return $sql." LIKE '".$this->escape_like_str($this->dbprefix)."%'"; } return $sql; diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index ccd641950..b87b41112 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -494,7 +494,7 @@ class CI_DB_oci8_driver extends CI_DB { if ($prefix_limit !== FALSE && $this->dbprefix !== '') { - $sql .' WHERE "TABLE_NAME" LIKE \''.$this->escape_like_str($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/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index 559617ae7..f5d77a147 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -255,7 +255,7 @@ class CI_DB_odbc_driver extends CI_DB { if ($prefix_limit !== FALSE && $this->dbprefix !== '') { - $sql ." AND table_name LIKE '".$this->escape_like_str($this->dbprefix)."%' " + return $sql." AND table_name LIKE '".$this->escape_like_str($this->dbprefix)."%' " .sprintf($this->_like_escape_str, $this->_like_escape_chr); } diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index 8f72199e0..3f3e3f018 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -430,7 +430,7 @@ class CI_DB_postgre_driver extends CI_DB { if ($prefix_limit !== FALSE && $this->dbprefix !== '') { - $sql .' AND "table_name" LIKE \'' + return $sql.' AND "table_name" LIKE \'' .$this->escape_like_str($this->dbprefix)."%' " .sprintf($this->_like_escape_str, $this->_like_escape_chr); } diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php index 42dd9a705..9d9caa0b4 100644 --- a/system/database/drivers/sqlite/sqlite_driver.php +++ b/system/database/drivers/sqlite/sqlite_driver.php @@ -233,7 +233,7 @@ class CI_DB_sqlite_driver extends CI_DB { if ($prefix_limit !== FALSE && $this->dbprefix != '') { - $sql ." AND 'name' LIKE '".$this->escape_like_str($this->dbprefix)."%' ".sprintf($this->_like_escape_str, $this->_like_escape_chr); + return $sql." AND 'name' LIKE '".$this->escape_like_str($this->dbprefix)."%' ".sprintf($this->_like_escape_str, $this->_like_escape_chr); } return $sql; -- cgit v1.2.3-24-g4f1b