Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/106925
Change subject: Call Linker methods statically
......................................................................
Call Linker methods statically
Change-Id: Ia37ffa514bb305fecb79376ffc55aab480a66b77
---
M GoogleMaps.body.php
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GoogleMaps
refs/changes/25/106925/1
diff --git a/GoogleMaps.body.php b/GoogleMaps.body.php
index a5199f4..fdde770 100644
--- a/GoogleMaps.body.php
+++ b/GoogleMaps.body.php
@@ -553,7 +553,6 @@
static function addMarker(&$pExporter, &$pParser,
&$pLocalParser, $pLat, $pLon,
$pIcon, $pTitle, $pTabs, $pCaption, $pLineColorSet) {
- global $wgUser;
$parsed = self::parseWikiText($pParser, $pLocalParser,
preg_replace('/\r\n/', '<br />', $pCaption), $pParser->mTitle,
$pParser->mOptions);
$title = Title::newFromText($pTitle);
@@ -571,8 +570,7 @@
$parsedArticleText = is_null($revision) ? null :
self::parseWikiText($pParser, $pLocalParser,
$revision->getText(), $revision->getTitle(), $pParser->mOptions);
$titleMaybeNonexistent = is_null($title) ?
Title::makeTitleSafe(NS_MAIN, $pTitle) : $title;
- $skin = $wgUser->getSkin();
- $titleLink = is_null($titleMaybeNonexistent) ? '' :
$skin->makeLinkObj($titleMaybeNonexistent);
+ $titleLink = is_null($titleMaybeNonexistent) ? '' :
Linker::makeLinkObj($titleMaybeNonexistent);
if (count($pTabs)) {
$pTabs[count($pTabs)-1]['googlemaps-caption'] =
$parsed;
$pExporter->addMarker( $pLat, $pLon, $pIcon,
$pTitle, $titleLink,
--
To view, visit https://gerrit.wikimedia.org/r/106925
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia37ffa514bb305fecb79376ffc55aab480a66b77
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GoogleMaps
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
