jenkins-bot has submitted this change and it was merged.
Change subject: Revert "Include cross-wiki notifications in serverside-rendered
badge"
......................................................................
Revert "Include cross-wiki notifications in serverside-rendered badge"
The hack that this introduced won't be needed after If78bfc710.
This reverts commit bbb096e605b9ed31954eae1c06d6d6b704b20b62.
Change-Id: I53278f40c50608f3d542ad21c5dc0c8e93a395f6
Depends-On: If78bfc710acd91a075771b565cc99f4c302a104d
---
M includes/skins/SkinMinerva.php
1 file changed, 1 insertion(+), 2 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index ec80170..e3bbd57 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -283,8 +283,7 @@
$notificationsTitle = SpecialPage::getTitleFor(
'Notifications' );
$notificationsMsg = $this->msg(
'mobile-frontend-user-button-tooltip' )->text();
if ( $currentTitle->getPrefixedText() !==
$notificationsTitle->getPrefixedText() ) {
- $notifUser = MWEchoNotifUser::newFromUser(
$user );
- $count = $notifUser->getAlertCount() +
$notifUser->getMessageCount();
+ $count = MWEchoNotifUser::newFromUser( $user
)->getNotificationCount();
$isZero = $count === 0;
$countLabel =
EchoNotificationController::formatNotificationCount( $count );
}
--
To view, visit https://gerrit.wikimedia.org/r/285663
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I53278f40c50608f3d542ad21c5dc0c8e93a395f6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
