diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-06-12 13:45:45 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-06-12 13:45:45 +0200 |
| commit | b30a7c0d53c5dae5dab2311f777d67f639a5cee4 (patch) | |
| tree | d518bc938a5d8458a55277d9adaa7d8fdcc9f1d3 /system/database/drivers/interbase/interbase_driver.php | |
| parent | 3902e383b41c6c0ef77b65e95d451cb2ea3d85db (diff) | |
| parent | 4e9538fe19b09c0dc588542cfb7f793348b83bf7 (diff) | |
Merge upstream
Diffstat (limited to 'system/database/drivers/interbase/interbase_driver.php')
| -rw-r--r-- | system/database/drivers/interbase/interbase_driver.php | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/system/database/drivers/interbase/interbase_driver.php b/system/database/drivers/interbase/interbase_driver.php index 8cbbfa17d..5a03607ee 100644 --- a/system/database/drivers/interbase/interbase_driver.php +++ b/system/database/drivers/interbase/interbase_driver.php @@ -324,13 +324,7 @@ class CI_DB_interbase_driver extends CI_DB { */ protected function _from_tables($tables) { - if ( ! is_array($tables)) - { - $tables = array($tables); - } - - //Interbase/Firebird doesn't like grouped tables - return implode(', ', $tables); + return is_array($tables) ? implode(', ', $tables) : $tables; } // -------------------------------------------------------------------- |