diff options
Diffstat (limited to 'system/database')
| -rw-r--r--[-rwxr-xr-x] | system/database/DB.php | 0 | ||||
| -rw-r--r-- | system/database/DB_active_rec.php | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/system/database/DB.php b/system/database/DB.php index d74738a03..d74738a03 100755..100644 --- a/system/database/DB.php +++ b/system/database/DB.php diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 85faa555d..811df97fb 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -255,7 +255,7 @@ class CI_DB_active_record extends CI_DB_driver { */ public function from($from) { - foreach ((array) $from as $val) + foreach ((array)$from as $val) { if (strpos($val, ',') !== FALSE) { @@ -1647,7 +1647,7 @@ class CI_DB_active_record extends CI_DB_driver { if (strpos($table, " ") !== FALSE) { // if the alias is written with the AS keyword, remove it - $table = preg_replace('/\s+AS\s+/i', ' ', $table); + $table = preg_replace('/ AS /i', ' ', $table); // Grab the alias $table = trim(strrchr($table, " ")); |