From ca32f08966f1b51fcb19460f0996bb0c4048e6fe Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 3 Dec 2011 13:29:22 +0100
Subject: Update to MediaWiki 1.18.0

* also update ArchLinux skin to chagnes in MonoBook
* Use only css to hide our menu bar when printing
---
 includes/search/SearchMssql.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'includes/search/SearchMssql.php')

diff --git a/includes/search/SearchMssql.php b/includes/search/SearchMssql.php
index 8b850fae..ebf19d3a 100644
--- a/includes/search/SearchMssql.php
+++ b/includes/search/SearchMssql.php
@@ -91,8 +91,9 @@ class SearchMssql extends SearchEngine {
 	/**
 	 * Return a LIMIT clause to limit results on the query.
 	 *
+	 * @param $sql string
+	 *
 	 * @return String
-	 * @private
 	 */
 	function queryLimit( $sql ) {
 		return $this->db->limitResult( $sql, $this->limit, $this->offset );
@@ -103,7 +104,6 @@ class SearchMssql extends SearchEngine {
 	 * subclasses may define this though
 	 *
 	 * @return String
-	 * @private
 	 */
 	function queryRanking( $filteredTerm, $fulltext ) {
 		return ' ORDER BY ftindex.[RANK] DESC'; // return ' ORDER BY score(1)';
@@ -115,7 +115,6 @@ class SearchMssql extends SearchEngine {
 	 *
 	 * @param $filteredTerm String
 	 * @param $fulltext Boolean
-	 * @private
 	 */
 	function getQuery( $filteredTerm, $fulltext ) {
 		return $this->queryLimit( $this->queryMain( $filteredTerm, $fulltext ) . ' ' .
@@ -124,7 +123,6 @@ class SearchMssql extends SearchEngine {
 			$this->queryRanking( $filteredTerm, $fulltext ) . ' ' );
 	}
 
-
 	/**
 	 * Picks which field to index on, depending on what type of query.
 	 *
@@ -159,7 +157,7 @@ class SearchMssql extends SearchEngine {
 		$lc = SearchEngine::legalSearchChars();
 		$this->searchTerms = array();
 
-		# FIXME: This doesn't handle parenthetical expressions.
+		# @todo FIXME: This doesn't handle parenthetical expressions.
 		$m = array();
 		$q = array();
 
-- 
cgit v1.2.3-54-g00ecf