From d9947c840bbce291c1cf3f0cb73f0c343686892e Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Wed, 13 Jun 2012 21:32:22 +0200 Subject: 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 --- system/database/DB_active_rec.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'system/database/DB_active_rec.php') 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, " ")); -- cgit v1.2.3-24-g4f1b