IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2026-08-10 04:58:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

FIX: allow staff members to send PMs when enable_private_messages is disabled

Browse Source
This commit is contained in:
Arpit Jalan
2017-02-22 11:32:09 +05:30
parent c191e2e84c
commit b32f33b3f0
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/guardian.rb
+1 -3
View File
@@ -279,9 +279,7 @@ class Guardian
# Have to be a basic level at least
@user.has_trust_level?(SiteSetting.min_trust_to_send_messages) &&
# PMs are enabled
(SiteSetting.enable_private_messages ||
@user.username == SiteSetting.site_contact_username ||
@user == Discourse.system_user) &&
(is_staff? || SiteSetting.enable_private_messages) &&
# Can't send PMs to suspended users
(is_staff? || target.is_a?(Group) || !target.suspended?) &&
# Blocked users can only send PM to staff