From be4ee57160b51a0640a7c8b460f868f594e06ffc Mon Sep 17 00:00:00 2001 From: blowdoof Date: Fri, 18 Oct 2013 20:14:09 +0200 Subject: Revert "Bugfix on the active record join statement with empty conditions" This reverts commit 2cfbfc54dc68d9e7ed7c20af4cf7693736bbd447. --- system/database/DB_active_rec.php | 6 +----- 1 file changed, 1 insertion(+), 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) -- cgit v1.2.3-24-g4f1b