diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-06-15 00:02:16 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-06-15 00:02:16 +0200 |
| commit | c9bb0c5b7a3a349a5c255b02b5cc7ddbe32132e5 (patch) | |
| tree | 905ff3f3153720c1d1547092e54feaf0e46568a6 /system/database/drivers/interbase/interbase_driver.php | |
| parent | 3061ee737ff2c1853428482e1704b0973b621118 (diff) | |
| parent | f11a1939c25de1e327c7c02001c8fbd1ec1fc7b4 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
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; } // -------------------------------------------------------------------- |