github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 07:11:34 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: TL0 users' messages to moderators were not being posted when flagging private messages

Browse Source
This commit is contained in:
Neil Lalonde
2017-10-13 11:55:49 -04:00
parent 6f923d5964
commit b124e5f19f
4 changed files with 96 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/guardian.rb
View File

@ -289,8 +289,10 @@ class Guardian
(target.is_a?(Group) || target.is_a?(User)) &&
# User is authenticated
authenticated? &&
# Have to be a basic level at least
@user.has_trust_level?(SiteSetting.min_trust_to_send_messages) &&
# Have to be a basic level at least, or are contacting moderators
(@user.has_trust_level?(SiteSetting.min_trust_to_send_messages) ||
(target.is_a?(User) && target.moderator?) ||
(target.name == Group[:moderators].name)) &&
# PMs are enabled
(is_staff? || SiteSetting.enable_private_messages) &&
# Can't send PMs to suspended users