From: Sam Reed <reedy@users.mediawiki.org>
Date: Mon, 13 Dec 2010 11:06:57 +0000 (+0000)
Subject: Followup r78268, do it as Bryan suggested, not as how I'd interpretted it for some... 
X-Git-Tag: 1.31.0-rc.0~33346
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=9b815345afb02dae39ff18cb98ff088bec1c7f6b;p=lhc%2Fweb%2Fwiklou.git

Followup r78268, do it as Bryan suggested, not as how I'd interpretted it for some daft reason
---

diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php
index 0a4b7c56d1..984322d812 100644
--- a/includes/search/SearchEngine.php
+++ b/includes/search/SearchEngine.php
@@ -92,8 +92,6 @@ class SearchEngine {
 	public static function getNearMatch( $searchterm ) {
 		$title = self::getNearMatchInternal( $searchterm );
 
-		wfRunHooks( 'SpecialSearchGomatch', array( &$title ) );
-
 		wfRunHooks( 'SearchGetNearMatchComplete', array( $searchterm, &$title ) );
 		return $title;
 	}
diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index c467102982..99cc0bfbf3 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -102,6 +102,7 @@ class SpecialSearch extends SpecialPage {
 		}
 		# If there's an exact or very near match, jump right there.
 		$t = SearchEngine::getNearMatch( $term );
+		wfRunHooks( 'SpecialSearchGomatch', array( &$t ) );
 		if( !is_null( $t ) ) {
 			$wgOut->redirect( $t->getFullURL() );
 			return;