summaryrefslogtreecommitdiff
path: root/includes/search/SearchMySQL.php
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2013-01-18 16:46:04 +0100
committerPierre Schmitz <pierre@archlinux.de>2013-01-18 16:46:04 +0100
commit63601400e476c6cf43d985f3e7b9864681695ed4 (patch)
treef7846203a952e38aaf66989d0a4702779f549962 /includes/search/SearchMySQL.php
parent8ff01378c9e0207f9169b81966a51def645b6a51 (diff)
Update to MediaWiki 1.20.2
this update includes: * adjusted Arch Linux skin * updated FluxBBAuthPlugin * patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024
Diffstat (limited to 'includes/search/SearchMySQL.php')
-rw-r--r--includes/search/SearchMySQL.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/includes/search/SearchMySQL.php b/includes/search/SearchMySQL.php
index af8f3875..5cee03e0 100644
--- a/includes/search/SearchMySQL.php
+++ b/includes/search/SearchMySQL.php
@@ -290,7 +290,7 @@ class SearchMySQL extends SearchEngine {
/**
* Get the base part of the search query.
*
- * @param &$query Search query array
+ * @param &$query array Search query array
* @param $filteredTerm String
* @param $fulltext Boolean
* @since 1.18 (changed)
@@ -308,6 +308,7 @@ class SearchMySQL extends SearchEngine {
/**
* @since 1.18 (changed)
+ * @return array
*/
function getCountQuery( $filteredTerm, $fulltext ) {
$match = $this->parseQuery( $filteredTerm, $fulltext );
@@ -365,6 +366,7 @@ class SearchMySQL extends SearchEngine {
/**
* Converts some characters for MySQL's indexing to grok it correctly,
* and pads short words to overcome limitations.
+ * @return mixed|string
*/
function normalizeText( $string ) {
global $wgContLang;
@@ -412,6 +414,7 @@ class SearchMySQL extends SearchEngine {
* Armor a case-folded UTF-8 string to get through MySQL's
* fulltext search without being mucked up by funny charset
* settings or anything else of the sort.
+ * @return string
*/
protected function stripForSearchCallback( $matches ) {
return 'u8' . bin2hex( $matches[1] );