diff options
| author | blowdoof <blowdoof@gmail.com> | 2013-10-18 20:14:09 +0200 |
|---|---|---|
| committer | blowdoof <blowdoof@gmail.com> | 2013-10-18 20:14:09 +0200 |
| commit | be4ee57160b51a0640a7c8b460f868f594e06ffc (patch) | |
| tree | ba818ffca960ed6d2da97e6709ba68442383956b /system/database | |
| parent | 2cfbfc54dc68d9e7ed7c20af4cf7693736bbd447 (diff) | |
Revert "Bugfix on the active record join statement with empty conditions"
This reverts commit 2cfbfc54dc68d9e7ed7c20af4cf7693736bbd447.
Diffstat (limited to 'system/database')
| -rw-r--r-- | system/database/DB_active_rec.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 5bf0d8f1d..b1d56b7ec 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -337,11 +337,7 @@ class CI_DB_active_record extends CI_DB_driver { } // Assemble the JOIN statement: only use ON if a condition was passed - $join = $type.'JOIN '.$this->_protect_identifiers($table, TRUE, NULL, FALSE); - if ($cond) - { - $join .= ' ON '.$cond; - } + $join = $type.'JOIN '.$this->_protect_identifiers($table, TRUE, NULL, FALSE).' ON '.$cond; $this->ar_join[] = $join; if ($this->ar_caching === TRUE) |