summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-03-05 20:35:34 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-03-05 20:35:34 +0100
commit68c0173c33db7e27487097994d1c319b588484ee (patch)
tree223924f0d3932e08a485326bb881efa152fe4a44 /system
parent0046d08af0d395fa53e23304707a0df0f36361d5 (diff)
parent2eee0aaacc1b4aff6e1137954dfe1a09c491cdb6 (diff)
Merge pull request #1131 from tiyowan/develop
Fix issue #64
Diffstat (limited to 'system')
-rw-r--r--system/database/DB_active_rec.php2
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]);
}