diff options
| author | Florian Pritz <bluewind@xinu.at> | 2012-06-13 21:32:22 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2012-06-13 21:32:22 +0200 |
| commit | d9947c840bbce291c1cf3f0cb73f0c343686892e (patch) | |
| tree | 9789b54cfa98bf440ce5f401e8d2f9eb0df3791d /system/database/DB_active_rec.php | |
| parent | 787914f40313e267205ea4a50ed63fc4ba74b8c8 (diff) | |
Revert "Fix issue #1387"
This reverts commit bc602d8b8e125597bfd557949e846ff5a258b858.
This break the session cleanup.
References:
https://github.com/EllisLab/CodeIgniter/issues/1387#issuecomment-6307876
Conflicts:
user_guide/changelog.html
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'system/database/DB_active_rec.php')
| -rwxr-xr-x | system/database/DB_active_rec.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 10febb1fc..841ede28e 100755 --- 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, " ")); |