summaryrefslogtreecommitdiffstats
path: root/system/database/DB_query_builder.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-06-11 20:28:22 +0200
committerAndrey Andreev <narf@bofh.bg>2012-06-11 20:28:22 +0200
commite6302791d229e42c8fc42a3982a10eb63508197f (patch)
treee95788419e78dfb7ee1b2a7a18234510a2602772 /system/database/DB_query_builder.php
parent88cb278a1e52dd7db5b0ebe2037c12f0dd69c0c1 (diff)
Fix a join() issue
Diffstat (limited to 'system/database/DB_query_builder.php')
-rw-r--r--system/database/DB_query_builder.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index 7490639dd..b99d4c607 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -343,7 +343,7 @@ abstract class CI_DB_query_builder 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]);
}