Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-05 08:59:27 +08:00
Code Packages Activity Actions 11

Revert "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-23 17:19:30 -04:00
parent dfdf12c92f
commit 4452d67a23
4 changed files with 50 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/guardian.rb
View file

@ -292,10 +292,8 @@ class Guardian
(is_group || is_user) &&
# User is authenticated
authenticated? &&
# 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)) &&
# Have to be a basic level at least
@user.has_trust_level?(SiteSetting.min_trust_to_send_messages) &&
# User disabled private message
(is_staff? || is_group || target.user_option.allow_private_messages) &&
# PMs are enabled