diff options
Diffstat (limited to 'system/database')
| -rw-r--r-- | system/database/DB_query_builder.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php index 00294c3df..3154d148b 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php @@ -2513,8 +2513,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver { { continue; } - - $this->$qb_variable = array_unique(array_merge($this->$qb_cache_var, $this->$qb_variable)); + $this->$qb_variable = array_merge($this->$qb_variable, array_diff($this->$qb_cache_var, $this->$qb_variable)); } // If we are "protecting identifiers" we need to examine the "from" @@ -2524,7 +2523,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver { $this->_track_aliases($this->qb_from); } - $this->qb_no_escape = $this->qb_cache_no_escape; + $this->qb_no_escape = array_merge($this->qb_no_escape, array_diff($this->qb_cache_no_escape, $this->qb_no_escape)); } // -------------------------------------------------------------------- |