jenkins-bot has submitted this change and it was merged.
Change subject: (bug 51640) wgUserNewMsgRevisionId is null with only one rev
......................................................................
(bug 51640) wgUserNewMsgRevisionId is null with only one rev
wgUserNewMsgRevisionId is null with only one revision and that revision is
not viewed, this makes it not reliable for determining if there is new
message. We just switch to check against $user->getNewtalk() instead.
We can still use wgUserNewMsgRevisionId to generate diff links if desired
Change-Id: I4cf50a944aada03151bd17f3610bd59b3bfb2bf2
---
M Hooks.php
M modules/alert/ext.echo.alert.js
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Kaldari: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Hooks.php b/Hooks.php
index 1d01be0..a7c8be1 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' ) ) {
+ if ( $wgEchoNewMsgAlert && $user->isLoggedIn() &&
$user->getOption( 'echo-show-alert' ) && $user->getNewtalk() ) {
$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 8fffe54..52548ad 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( 'wgUserNewMsgRevisionId' ) && !mw.config.get(
'echoNewMsgAlertDisplayed' ) ) {
+ if ( !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/74666
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4cf50a944aada03151bd17f3610bd59b3bfb2bf2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Bsitu <[email protected]>
Gerrit-Reviewer: Bsitu <[email protected]>
Gerrit-Reviewer: EBernhardson (WMF) <[email protected]>
Gerrit-Reviewer: Kaldari <[email protected]>
Gerrit-Reviewer: Matthias Mullie <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
