jenkins-bot has submitted this change and it was merged.
Change subject: SpecialLinkSearch: Use LinkRenderer instead of
MediaWikiPageLinkRenderer
......................................................................
SpecialLinkSearch: Use LinkRenderer instead of MediaWikiPageLinkRenderer
Change-Id: Ib117e4db841327c302f9ceaa97aaa52b6391b093
---
M includes/specials/SpecialLinkSearch.php
1 file changed, 1 insertion(+), 34 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialLinkSearch.php
b/includes/specials/SpecialLinkSearch.php
index 1ecbee0..d4886f0 100644
--- a/includes/specials/SpecialLinkSearch.php
+++ b/includes/specials/SpecialLinkSearch.php
@@ -30,11 +30,6 @@
/** @var array|bool */
private $mungedQuery = false;
- /**
- * @var PageLinkRenderer
- */
- protected $linkRenderer = null;
-
function setParams( $params ) {
$this->mQuery = $params['query'];
$this->mNs = $params['namespace'];
@@ -49,39 +44,11 @@
// using the setServices() method.
}
- /**
- * Initialize or override the PageLinkRenderer LinkSearchPage
collaborates with.
- * Useful mainly for testing.
- *
- * @todo query logic and rendering logic should be split and also
injected
- *
- * @param PageLinkRenderer $linkRenderer
- */
- public function setPageLinkRenderer(
- PageLinkRenderer $linkRenderer
- ) {
- $this->linkRenderer = $linkRenderer;
- }
-
- /**
- * Initialize any services we'll need (unless it has already been
provided via a setter).
- * This allows for dependency injection even though we don't control
object creation.
- */
- private function initServices() {
- global $wgContLang;
- if ( !$this->linkRenderer ) {
- $titleFormatter = new MediaWikiTitleCodec( $wgContLang,
GenderCache::singleton() );
- $this->linkRenderer = new MediaWikiPageLinkRenderer(
$titleFormatter );
- }
- }
-
function isCacheable() {
return false;
}
public function execute( $par ) {
- $this->initServices();
-
$this->setHeaders();
$this->outputHeader();
@@ -277,7 +244,7 @@
*/
function formatResult( $skin, $result ) {
$title = new TitleValue( (int)$result->namespace,
$result->title );
- $pageLink = $this->linkRenderer->renderHtmlLink( $title );
+ $pageLink = $this->getLinkRenderer()->makeLink( $title );
$url = $result->url;
$urlLink = Linker::makeExternalLink( $url, $url );
--
To view, visit https://gerrit.wikimedia.org/r/290391
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib117e4db841327c302f9ceaa97aaa52b6391b093
Gerrit-PatchSet: 9
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
