github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-04 05:26:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

rename 'enable_private_messages' to 'enable_personal_messages'

Browse Source
This commit is contained in:
Arpit Jalan
2018-01-31 11:33:12 +05:30
parent 25ec077eca
commit ff0376a80b
13 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/guardian.rb
View File

@ -247,7 +247,7 @@ class Guardian
def can_invite_to?(object, groups = nil)
return false unless authenticated?
return true if is_admin?
return false unless SiteSetting.enable_private_messages?
return false unless SiteSetting.enable_personal_messages?
return false if (SiteSetting.max_invites_per_day.to_i == 0 && !is_staff?)
return false unless can_see?(object)
return false if groups.present?
@ -303,7 +303,7 @@ class Guardian
# User disabled private message
(is_staff? || is_group || target.user_option.allow_private_messages) &&
# PMs are enabled
(is_staff? || SiteSetting.enable_private_messages) &&
(is_staff? || SiteSetting.enable_personal_messages) &&
# Can't send PMs to suspended users
(is_staff? || is_group || !target.suspended?) &&
# Check group messageable level