jenkins-bot has submitted this change and it was merged.
Change subject: Revert "(bug 51640) wgUserNewMsgRevisionId is null with only
one rev"
......................................................................
Revert "(bug 51640) wgUserNewMsgRevisionId is null with only one rev"
This reverts commit b9e5b2f64a9758c4dfa9be47f46e3b4a8d318c9d.
Change-Id: I64cd03dd0789f482221f8f38bbf9a034025e45f9
---
M Hooks.php
M modules/alert/ext.echo.alert.js
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Bsitu: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Hooks.php b/Hooks.php
index a7c8be1..1d01be0 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -627,7 +627,7 @@
// Load the styles for the Notifications badge
$out->addModuleStyles( 'ext.echo.badge' );
}
- if ( $wgEchoNewMsgAlert && $user->isLoggedIn() &&
$user->getOption( 'echo-show-alert' ) && $user->getNewtalk() ) {
+ if ( $wgEchoNewMsgAlert && $user->isLoggedIn() &&
$user->getOption( 'echo-show-alert' ) ) {
$out->addModules( array( 'ext.echo.alert' ) );
}
return true;
diff --git a/modules/alert/ext.echo.alert.js b/modules/alert/ext.echo.alert.js
index 52548ad..8fffe54 100644
--- a/modules/alert/ext.echo.alert.js
+++ b/modules/alert/ext.echo.alert.js
@@ -1,6 +1,6 @@
( function ( $, mw ) {
'use strict';
- if ( !mw.config.get( 'echoNewMsgAlertDisplayed' ) ) {
+ if ( mw.config.get( 'wgUserNewMsgRevisionId' ) && !mw.config.get(
'echoNewMsgAlertDisplayed' ) ) {
var alertMessage = mw.html.escape( mw.msg( 'colon-separator' )
+ mw.msg( 'echo-new-messages' ) );
$( '#pt-mytalk a' ).append( alertMessage );
$( '#pt-mytalk a' ).addClass( 'mw-echo-alert' );
--
To view, visit https://gerrit.wikimedia.org/r/76824
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I64cd03dd0789f482221f8f38bbf9a034025e45f9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Bsitu <[email protected]>
Gerrit-Reviewer: Bsitu <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
