jenkins-bot has submitted this change and it was merged.
Change subject: Fix watchstar for logged-out user
......................................................................
Fix watchstar for logged-out user
... as well as a couple of undefined variable errors.
This was caused by a typo in If95a2f4.
Bug: T141393
Change-Id: I79a9bbc2d933cf35043c563ecc89c86082d69f98
---
M includes/skins/SkinMinerva.php
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index ee8a67c..a15d99b 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -936,6 +936,7 @@
'class' => MobileUI::iconClass( '', 'element',
'icon-32px watch-this-article' ),
'is_js_only' => true
];
+ $title = $this->getTitle();
if ( isset( $actions['watch'] ) ) {
$result = array_merge( $actions['watch'], $baseResult );
@@ -944,7 +945,7 @@
$result['class'] .= ' watched';
} else {
// placeholder for not logged in
- $result = array_merge( $watchTemplate, [
+ $result = array_merge( $baseResult, [
// FIXME: makeLink (used by makeListItem) when
no text is present defaults to use the key
'text' => '',
'href' => $this->getLoginUrl( [ 'returnto' =>
$title ] ),
--
To view, visit https://gerrit.wikimedia.org/r/301362
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I79a9bbc2d933cf35043c563ecc89c86082d69f98
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Phuedx <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
