From: Mark A. Hershberger <mah@everybody.org>
Date: Thu, 25 Sep 2014 17:48:27 +0000 (-0400)
Subject: Update usage of getTitleSnippet(), getRedirectSnippet() and getSectionSnippet()
X-Git-Tag: 1.31.0-rc.0~13683^2
X-Git-Url: https://git.cyclocoop.org/%27.%24link.%27?a=commitdiff_plain;h=ee12c35ac51640dafdffa110be0946c5481b49f6;p=lhc%2Fweb%2Fwiklou.git

Update usage of getTitleSnippet(), getRedirectSnippet() and getSectionSnippet()

According to I5aae8caf, the parameter is gone now.  Found while
tracking down a strict warning in MWSearch.

Change-Id: I571e015814ea756771c66c243cb8db86448db463
---

diff --git a/includes/api/ApiQuerySearch.php b/includes/api/ApiQuerySearch.php
index b7dcd0ed2b..a4db57a13e 100644
--- a/includes/api/ApiQuerySearch.php
+++ b/includes/api/ApiQuerySearch.php
@@ -168,7 +168,7 @@ class ApiQuerySearch extends ApiQueryGeneratorBase {
 					$vals['timestamp'] = wfTimestamp( TS_ISO_8601, $result->getTimestamp() );
 				}
 				if ( isset( $prop['titlesnippet'] ) ) {
-					$vals['titlesnippet'] = $result->getTitleSnippet( $terms );
+					$vals['titlesnippet'] = $result->getTitleSnippet();
 				}
 				if ( !is_null( $result->getRedirectTitle() ) ) {
 					if ( isset( $prop['redirecttitle'] ) ) {
diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index adc248eafa..e3e2f4ef69 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -591,7 +591,7 @@ class SpecialSearch extends SpecialPage {
 
 		$title = $result->getTitle();
 
-		$titleSnippet = $result->getTitleSnippet( $terms );
+		$titleSnippet = $result->getTitleSnippet();
 
 		if ( $titleSnippet == '' ) {
 			$titleSnippet = null;