diff options
| author | Andrey Andreev <narf@devilix.net> | 2016-02-05 13:04:32 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2016-02-05 13:04:32 +0100 |
| commit | 28fdb3185c4f1e4f78b493c5a7eab09e975260ef (patch) | |
| tree | 510c12965e95dd04689ff91217e349aaed9d8412 /system/database | |
| parent | 805eddaefd9503b5dbbd924bd6da66e29c4768f3 (diff) | |
Fix a regression caused by 805eddaefd9503b5dbbd924bd6da66e29c4768f3
Diffstat (limited to 'system/database')
| -rw-r--r-- | system/database/DB_query_builder.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php index 68df309f9..b46730e22 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php @@ -552,9 +552,9 @@ abstract class CI_DB_query_builder extends CI_DB_driver { $cond = ' ON '.$newcond; } // Split apart the condition and protect the identifiers - elseif ($escape === TRUE && preg_match("/(.*)([\[\]\w\.'-]+)(\s*[^\"\[`'\w]+\s*)(.+)/i", $cond, $match)) + elseif ($escape === TRUE && preg_match("/([\[\]\w\.'-]+)(\s*[^\"\[`'\w]+\s*)(.+)/i", $cond, $match)) { - $cond = ' ON '.$match[1].$this->protect_identifiers($match[2]).$match[3].$this->protect_identifiers($match[4]); + $cond = ' ON '.$this->protect_identifiers($match[1]).$match[2].$this->protect_identifiers($match[3]); } elseif ( ! $this->_has_operator($cond)) { |