From: umherirrender <umherirrender_de.wp@web.de>
Date: Fri, 20 Sep 2013 18:54:19 +0000 (+0200)
Subject: SearchEngine::userHighlightPrefs needs no user
X-Git-Tag: 1.31.0-rc.0~18707^2
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=d1d5d6c209d8885666a384fd8e6d8bc110623034;p=lhc%2Fweb%2Fwiklou.git

SearchEngine::userHighlightPrefs needs no user

Was removed with r87215 from the function,
but not from the function call

Change-Id: Iacb247d5962fe77db5a29084ece941261bf306ec
---

diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php
index e5925fa344..71c05d8b03 100644
--- a/includes/search/SearchEngine.php
+++ b/includes/search/SearchEngine.php
@@ -877,11 +877,11 @@ class SearchResult {
 	 * @return String: highlighted text snippet, null (and not '') if not supported
 	 */
 	function getTextSnippet( $terms ) {
-		global $wgUser, $wgAdvancedSearchHighlighting;
+		global $wgAdvancedSearchHighlighting;
 		$this->initText();
 
 		// TODO: make highliter take a content object. Make ContentHandler a factory for SearchHighliter.
-		list( $contextlines, $contextchars ) = SearchEngine::userHighlightPrefs( $wgUser );
+		list( $contextlines, $contextchars ) = SearchEngine::userHighlightPrefs();
 		$h = new SearchHighlighter();
 		if ( $wgAdvancedSearchHighlighting ) {
 			return $h->highlightText( $this->mText, $terms, $contextlines, $contextchars );