diff options
| author | blowdoof <blowdoof@gmail.com> | 2013-10-18 20:14:09 +0200 |
|---|---|---|
| committer | blowdoof <blowdoof@gmail.com> | 2013-10-18 20:16:01 +0200 |
| commit | 149412915c0ab247cbe84420d52940b1c6b0df7a (patch) | |
| tree | a2d4eff26360b09fbef20ca1fd26628b5f6747dc /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 | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 5bf0d8f1d..129eaa7b6 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -336,12 +336,8 @@ class CI_DB_active_record extends CI_DB_driver { $cond = $match[1].$match[2].$match[3]; } - // 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; - } + // Assemble the JOIN statement + $join = $type.'JOIN '.$this->_protect_identifiers($table, TRUE, NULL, FALSE).' ON '.$cond; $this->ar_join[] = $join; if ($this->ar_caching === TRUE) |