jenkins-bot has submitted this change and it was merged.
Change subject: (bug 39513) Check lqtnotifytalk property correctly
......................................................................
(bug 39513) Check lqtnotifytalk property correctly
Change-Id: I79e79c5df646081e7a96df82e5945b37ac663b0d
---
M classes/NewMessagesController.php
1 file changed, 7 insertions(+), 4 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/classes/NewMessagesController.php
b/classes/NewMessagesController.php
index 73f2ad0..732c069 100644
--- a/classes/NewMessagesController.php
+++ b/classes/NewMessagesController.php
@@ -204,11 +204,14 @@
NewMessages::recacheMessageCount( $row->wl_user
);
}
- $wantsTalkNotification = true;
+ global $wgHiddenPrefs;
+ if ( !in_array( 'lqtnotifytalk', $wgHiddenPrefs ) &&
isset( $row->up_value ) ) {
+ $wantsTalkNotification = (bool) $row->wl_user;
+ } else {
+ $wantsTalkNotification =
User::getDefaultOption( 'lqtnotifytalk' );
+ }
- $wantsTalkNotification = $wantsTalkNotification &&
User::getDefaultOption( 'lqtnotifytalk' );
-
- if ( $wantsTalkNotification || $row->up_value ) {
+ if ( $wantsTalkNotification ) {
$notifyUsers[] = $row->wl_user;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/49701
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I79e79c5df646081e7a96df82e5945b37ac663b0d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: Siebrand <siebr...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
