diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-06-10 05:18:14 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-06-10 05:18:14 +0200 |
| commit | 5a257187c4ca09ea61c19999bf061cec3f224cc2 (patch) | |
| tree | 56f5208bac5394f37c16e62625a149b3746d8e23 /system/database/DB_query_builder.php | |
| parent | 92aa67cf67292b20cfb8f18fc9e24b7408620355 (diff) | |
Merge branch 2.1-stable into develop
Diffstat (limited to 'system/database/DB_query_builder.php')
| -rw-r--r-- | system/database/DB_query_builder.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php index 5d0a2ae2c..3b45bbada 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php @@ -1985,7 +1985,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver { if (strpos($table, ' ') !== FALSE) { // if the alias is written with the AS keyword, remove it - $table = preg_replace('/ AS /i', ' ', $table); + $table = preg_replace('/\s+AS\s+/i', ' ', $table); // Grab the alias $table = trim(strrchr($table, ' ')); |