jenkins-bot has submitted this change and it was merged.
Change subject: Remove global state in SearchHookHandler
......................................................................
Remove global state in SearchHookHandler
Change-Id: If849df60582d8fb2b83405517fed17d54ae8c8ba
---
M includes/SearchHookHandler.php
1 file changed, 11 insertions(+), 17 deletions(-)
Approvals:
Lucie Kaffee: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/SearchHookHandler.php b/includes/SearchHookHandler.php
index daa0a51..3c18000 100644
--- a/includes/SearchHookHandler.php
+++ b/includes/SearchHookHandler.php
@@ -4,6 +4,7 @@
use OutputPage;
use SpecialSearch;
+use SpecialPage;
use Wikibase\Client\WikibaseClient;
use Wikibase\Lib\Interactors\TermIndexSearchInteractor;
use Wikibase\Lib\Interactors\TermSearchResult;
@@ -34,19 +35,17 @@
private $languageCode;
/**
- * @param string $language user language
+ * @param SpecialPage $specialPage
*
* @return self
*/
- private static function newFromGlobalState( $language ) {
- global $wgLanguageCode;
-
+ private static function newFromGlobalState( SpecialPage $specialPage ) {
$wikibaseClient = WikibaseClient::getDefaultInstance();
return new self(
$wikibaseClient->getStore()->getTermIndex(),
- $wikibaseClient->newTermSearchInteractor( $language ),
- $wgLanguageCode
+ $wikibaseClient->newTermSearchInteractor(
$specialPage->getLanguage()->getCode() ),
+ $specialPage->getConfig()->get( 'LanguageCode' )
);
}
@@ -80,8 +79,7 @@
if ( $term === null || $term === '' ) {
return;
}
- // user language, not content language
- $instance = self::newFromGlobalState(
$specialSearch->getLanguage()->getCode() );
+ $instance = self::newFromGlobalState( $specialSearch );
$instance->addToSearch( $specialSearch, $output, $term );
return true;
}
@@ -94,18 +92,14 @@
public function addToSearch( SpecialSearch $specialSearch, OutputPage
$output, $term ) {
$searchResult = $this->getSearchResults( $term );
if ( $searchResult !== null ) {
- $output->addWikiText( $this->getSearchHeader() );
+ $output->addWikiText(
+ '==' .
+ $output->msg(
'articleplaceholder-search-header' )->text() .
+ '=='
+ );
$output->addWikiText( $searchResult );
}
- }
-
- /**
- * @return string
- */
- private function getSearchHeader() {
- $header = '==' . wfMessage( 'articleplaceholder-search-header'
)->text() . '==';
- return $header;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/280836
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If849df60582d8fb2b83405517fed17d54ae8c8ba
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/ArticlePlaceholder
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Lucie Kaffee <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
