diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-06-11 21:35:35 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-06-11 21:35:35 +0200 |
| commit | 1d1d7ffc3868fd76b46fdce093fab0ce89320e94 (patch) | |
| tree | 8085a31fc02d1944da12f277a9f7e2dac7ad4b7e /system/database | |
| parent | 5d28176a76355b230f1c4e1858475def4e34fa4c (diff) | |
Fix an issue introduced in 88cb278a1e52dd7db5b0ebe2037c12f0dd69c0c1
Diffstat (limited to 'system/database')
| -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 b99d4c607..645ac3969 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php @@ -965,7 +965,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver { } elseif ($direction !== $this->_random_keyword && $escape === TRUE) { - $part = preg_match('/^(.+)\s+(ASC|DESC)$/i', $orderby, $matches) + $orderby = preg_match('/^(.+)\s+(ASC|DESC)$/i', $orderby, $matches) ? $this->protect_identifiers(rtrim($matches[1])).' '.$matches[2] : $this->protect_identifiers($orderby); } |