diff options
| author | tianhe1986 <w1s2j3229@163.com> | 2017-01-17 11:36:14 +0100 |
|---|---|---|
| committer | tianhe1986 <w1s2j3229@163.com> | 2017-01-17 11:36:14 +0100 |
| commit | 8d4af96a727140d49ffdb0ca05d2d154f3278e22 (patch) | |
| tree | faec94ea85da8917cf65e12b00084ae8aa7d9fbe | |
| parent | 1f4df78b5fae3251b9c0c5617946ab959cad4cd2 (diff) | |
1 Keep just 'list'.
2 Using strict mode with in_array().
3 Do not re-align.
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
| -rw-r--r-- | system/database/DB_query_builder.php | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php index 407b0d5d8..395f7c19b 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php @@ -215,7 +215,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver { protected $qb_cache_join = array(); /** - * QB Cache aliased tables list data + * QB Cache aliased tables list * * @var array */ @@ -2288,10 +2288,10 @@ abstract class CI_DB_query_builder extends CI_DB_driver { $table = trim(strrchr($table, ' ')); // Store the alias, if it doesn't already exist - if ( ! in_array($table, $this->qb_aliased_tables)) + if ( ! in_array($table, $this->qb_aliased_tables, TRUE)) { $this->qb_aliased_tables[] = $table; - if ($this->qb_caching === TRUE && ! in_array($table, $this->qb_cache_aliased_tables)) + if ($this->qb_caching === TRUE && ! in_array($table, $this->qb_cache_aliased_tables, TRUE)) { $this->qb_cache_aliased_tables[] = $table; $this->qb_cache_exists[] = 'aliased_tables'; @@ -2628,17 +2628,17 @@ abstract class CI_DB_query_builder extends CI_DB_driver { public function flush_cache() { $this->_reset_run(array( - 'qb_cache_select' => array(), - 'qb_cache_from' => array(), - 'qb_cache_join' => array(), + 'qb_cache_select' => array(), + 'qb_cache_from' => array(), + 'qb_cache_join' => array(), + 'qb_cache_where' => array(), + 'qb_cache_groupby' => array(), + 'qb_cache_having' => array(), + 'qb_cache_orderby' => array(), + 'qb_cache_set' => array(), + 'qb_cache_exists' => array(), + 'qb_cache_no_escape' => array(), 'qb_cache_aliased_tables' => array(), - 'qb_cache_where' => array(), - 'qb_cache_groupby' => array(), - 'qb_cache_having' => array(), - 'qb_cache_orderby' => array(), - 'qb_cache_set' => array(), - 'qb_cache_exists' => array(), - 'qb_cache_no_escape' => array() )); return $this; |