Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Add 'show-multimedia-search-results' to SearchEngine feature data"

Browse source
This commit is contained in:
jenkins-bot 2017-05-22 13:57:44 +00:00 committed by Gerrit Code Review
commit 3b70100a85
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
includes/specials/SpecialSearch.php
View file

@ -405,7 +405,8 @@ class SpecialSearch extends SpecialPage {
$this,
$sidebarResultWidget,
$linkRenderer,
MediaWikiServices::getInstance()->getInterwikiLookup()
MediaWikiServices::getInstance()->getInterwikiLookup(),
$search->getFeatureData( 'show-multimedia-search-results' )
);
} else {
$sidebarResultWidget = new SimpleSearchResultWidget( $this, $linkRenderer );

10
includes/widget/search/InterwikiSearchResultSetWidget.php
View file

@ -28,18 +28,22 @@ class InterwikiSearchResultSetWidget implements SearchResultSetWidget {
protected $iwLookup;
/** @var $output */
protected $output;
/** @var bool $showMultimedia */
protected $showMultimedia;
public function __construct(
SpecialSearch $specialSearch,
SearchResultWidget $resultWidget,
LinkRenderer $linkRenderer,
InterwikiLookup $iwLookup
InterwikiLookup $iwLookup,
$showMultimedia = false
) {
$this->specialSearch = $specialSearch;
$this->resultWidget = $resultWidget;
$this->linkRenderer = $linkRenderer;
$this->iwLookup = $iwLookup;
$this->output = $specialSearch->getOutput();
$this->showMultimedia = $showMultimedia;
}
/**
* @param string $term User provided search term
@ -54,7 +58,9 @@ class InterwikiSearchResultSetWidget implements SearchResultSetWidget {
$this->loadCustomCaptions();
$this->output->addModules( 'mediawiki.special.search.commonsInterwikiWidget' );
if ( $this->showMultimedia ) {
$this->output->addModules( 'mediawiki.special.search.commonsInterwikiWidget' );
}
$this->output->addModuleStyles( 'mediawiki.special.search.interwikiwidget.styles' );
$iwResults = [];