From: Chad Horohoe <chadh@wikimedia.org>
Date: Wed, 10 Sep 2014 19:22:04 +0000 (-0700)
Subject: Remove "related" searches
X-Git-Tag: 1.31.0-rc.0~14069^2
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=a82024c637bfcc4f000cb2e947d97dcdcdb5f791;p=lhc%2Fweb%2Fwiklou.git

Remove "related" searches

Poorly documented and never used anywhere properly.

- No core search backend supports it.
- MWSearch implements it but we've never turned it on.
- SolrStore copies MWSearch but it doesn't even work.
- CirrusSearch doesn't bother because it's silly.

Change-Id: I8b052e8e772030fba6c361fdb2775b10a7f7a15a
---

diff --git a/includes/api/ApiQuerySearch.php b/includes/api/ApiQuerySearch.php
index be6bc68f19..6c5023780b 100644
--- a/includes/api/ApiQuerySearch.php
+++ b/includes/api/ApiQuerySearch.php
@@ -176,9 +176,6 @@ class ApiQuerySearch extends ApiQueryGeneratorBase {
 						$vals['sectionsnippet'] = $result->getSectionSnippet();
 					}
 				}
-				if ( isset( $prop['hasrelated'] ) && $result->hasRelated() ) {
-					$vals['hasrelated'] = '';
-				}
 
 				// Add item to results and see whether it fits
 				$fit = $apiResult->addValue( array( 'query', $this->getModuleName() ),
diff --git a/includes/search/SearchResult.php b/includes/search/SearchResult.php
index 1d28691c83..c6d5d4ffc1 100644
--- a/includes/search/SearchResult.php
+++ b/includes/search/SearchResult.php
@@ -242,13 +242,6 @@ class SearchResult {
 		return strlen( $this->mText );
 	}
 
-	/**
-	 * @return bool If hit has related articles
-	 */
-	function hasRelated() {
-		return false;
-	}
-
 	/**
 	 * @return string Interwiki prefix of the title (return iw even if title is broken)
 	 */
diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index 3407476494..5cbc422cf1 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -673,26 +673,6 @@ class SpecialSearch extends SpecialPage {
 
 		$date = $lang->userTimeAndDate( $timestamp, $this->getUser() );
 
-		// link to related articles if supported
-		$related = '';
-		if ( $result->hasRelated() ) {
-			$stParams = array_merge(
-				$this->powerSearchOptions(),
-				array(
-					'search' => $this->msg( 'searchrelated' )->inContentLanguage()->text() .
-						':' . $title->getPrefixedText(),
-					'fulltext' => $this->msg( 'search' )->text()
-				)
-			);
-
-			$related = ' -- ' . Linker::linkKnown(
-				$this->getPageTitle(),
-				$this->msg( 'search-relatedarticle' )->text(),
-				array(),
-				$stParams
-			);
-		}
-
 		$fileMatch = '';
 		// Include a thumbnail for media files...
 		if ( $title->getNamespace() == NS_FILE ) {
@@ -718,7 +698,7 @@ class SpecialSearch extends SpecialPage {
 						'<td style="vertical-align: top;">' .
 						"{$link} {$redirect} {$section} {$fileMatch}" .
 						$extract .
-						"<div class='mw-search-result-data'>{$desc} - {$date}{$related}</div>" .
+						"<div class='mw-search-result-data'>{$desc} - {$date}</div>" .
 						'</td>' .
 						'</tr>' .
 						'</table>' .
@@ -738,7 +718,7 @@ class SpecialSearch extends SpecialPage {
 		) ) ) {
 			$html = "<li><div class='mw-search-result-heading'>" .
 				"{$link} {$redirect} {$section} {$fileMatch}</div> {$extract}\n" .
-				"<div class='mw-search-result-data'>{$size} - {$date}{$related}</div>" .
+				"<div class='mw-search-result-data'>{$size} - {$date}</div>" .
 				"</li>\n";
 		}