diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-06 13:58:37 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-06 13:58:37 +0100 |
| commit | 4c598360d646f734d254d45b397bc26984999f0a (patch) | |
| tree | 8fb31c27453edcde0214a6f553db9b207f49ce1c /system/database/DB_active_rec.php | |
| parent | 27984584d83784b39cf68e39200084ca2c8dc905 (diff) | |
| parent | 658e7b8e5d7953648f9cfe8cff082471cc292b68 (diff) | |
Merge upstream branch
Diffstat (limited to 'system/database/DB_active_rec.php')
| -rw-r--r-- | system/database/DB_active_rec.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index eaae23f30..f648e5591 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -341,7 +341,7 @@ class CI_DB_active_record extends CI_DB_driver { $this->_track_aliases($table); // Strip apart the condition and protect the identifiers - if (preg_match('/([\w\.]+)([\W\s]+)(.+)/', $cond, $match)) + if (preg_match('/([\[\w\.]+)([\W\s]+)(.+)/', $cond, $match)) { $cond = $this->_protect_identifiers($match[1]).$match[2].$this->_protect_identifiers($match[3]); } |