Merge pull request #1131 from tiyowan/develop

Fix issue #64
bcit-ci · Mar 5, 2012 · 68c0173 · 68c0173
2 parents 0046d08 + 2eee0aa
commit 68c0173
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
@@ -341,7 +341,7 @@ public function join($table, $cond, $type = '')
 		$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]);
 		}

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
@@ -158,6 +158,7 @@ Release Date: Not Released
 Bug fixes for 2.1.1
 -------------------
 
+-  Fixed a bug (#64) - Regular expression in DB_active_rec.php failed to handle queries containing SQL bracket delimiters in the join condition.
 -  Fixed a bug (#697) - A wrong array key was used in the Upload library to check for mime-types.
 -  Fixed a bug - form_open() compared $action against site_url() instead of base_url().
 -  Fixed a bug - CI_Upload::_file_mime_type() could've failed if mime_content_type() is used for the detection and returns FALSE.