fix 6159

joomla · Feb 25, 2015 · f395b9e · f395b9e
1 parent b91f038
commit f395b9e
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 3 deletions.
diff --git a/administrator/components/com_modules/models/modules.php b/administrator/components/com_modules/models/modules.php
@@ -331,7 +331,7 @@ protected function getListQuery()
 			{
 				$escapedSearchString = $this->refineSearchStringToRegex($search, '/');
 				$search = $db->quote($escapedSearchString);
-				$query->where('(' . 'a.title REGEXP ' . $search . ' OR a.note REGEXP ' . $search . ')');
+				$query->where('(' . 'a.title ' . $db->regexp($search) . ' OR a.note ' . $db->regexp($search) . ')');
 			}
 		}
 

diff --git a/administrator/components/com_templates/models/styles.php b/administrator/components/com_templates/models/styles.php
@@ -154,7 +154,7 @@ protected function getListQuery()
 			{
 				$escapedSearchString = $this->refineSearchStringToRegex($search, '/');
 				$search = $db->quote($escapedSearchString);
-				$query->where('(' . 'a.template REGEXP ' . $search . ' OR a.title REGEXP ' . $search . ')');
+				$query->where('(' . 'a.template ' . $db->regexp($search) . ' OR a.title ' . $db->regexp($search) . ')');
 			}
 		}
 

diff --git a/administrator/components/com_templates/models/templates.php b/administrator/components/com_templates/models/templates.php
@@ -112,7 +112,7 @@ protected function getListQuery()
 			{
 				$escapedSearchString = $this->refineSearchStringToRegex($search, '/');
 				$search = $db->quote($escapedSearchString);
-				$query->where('(' . 'a.element REGEXP ' . $search . ' OR a.name REGEXP ' . $search . ')');
+				$query->where('(' . 'a.element ' . $db->regexp($search) . ' OR a.name ' . $db->regexp($search) . ')');
 			}
 		}
 

diff --git a/libraries/joomla/database/query/mysqli.php b/libraries/joomla/database/query/mysqli.php
@@ -101,4 +101,23 @@ public function setLimit($limit = 0, $offset = 0)
 
 		return $this;
 	}
+
+	/**
+	 * Return correct regexp operator for mysqli.
+	 *
+	 * Ensure that the regexp operator is mysqli compatible.
+	 *
+	 * Usage:
+	 * $query->where('field ' . $db->regexp($search));
+	 *
+	 * @param   string  $value  The regex pattern.
+	 *
+	 * @return  string  Returns the regex operator.
+	 *
+	 * @since   11.3
+	 */
+	public function regexp($value)
+	{
+		return ' REGEXP ' . $value;
+	}
 }
diff --git a/libraries/joomla/database/query/postgresql.php b/libraries/joomla/database/query/postgresql.php
@@ -619,4 +619,23 @@ public function dateAdd($date, $interval, $datePart)
 			return "timestamp '" . $date . "' - interval '" . ltrim($interval, '-') . " " . $datePart . "'";
 		}
 	}
+
+	/**
+	 * Return correct regexp operator for Postgresql.
+	 *
+	 * Ensure that the regexp operator is Postgresql compatible.
+	 *
+	 * Usage:
+	 * $query->where('field ' . $db->regexp($search));
+	 *
+	 * @param   string  $value  The regex pattern.
+	 *
+	 * @return  string  Returns the regex operator.
+	 *
+	 * @since   11.3
+	 */
+	public function regexp($value)
+	{
+		return ' ~* ' . $value;
+	}
 }