codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-23 23:58:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Also allow system_user to send pm's even if enable_private_messages is disabled

Browse source
This commit is contained in:
Neil Lalonde 2014-04-25 14:52:57 -04:00
parent 1a7ef2ae64
commit 7993c27ce5
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/guardian.rb
View file

@ -210,7 +210,9 @@ class Guardian
# Have to be a basic level at least
@user.has_trust_level?(:basic) &&
# PMs are enabled
(SiteSetting.enable_private_messages || @user.username == SiteSetting.site_contact_username)
(SiteSetting.enable_private_messages ||
@user.username == SiteSetting.site_contact_username ||
@user == Discourse.system_user)
end
private

3
spec/components/guardian_spec.rb
View file

@ -136,9 +136,10 @@ describe Guardian do
Guardian.new(user).can_send_private_message?(another_user).should be_false
end
it "returns true for the contact user" do
it "returns true for the contact user and system user" do
SiteSetting.stubs(:site_contact_username).returns(user.username)
Guardian.new(user).can_send_private_message?(another_user).should be_true
Guardian.new(Discourse.system_user).can_send_private_message?(another_user).should be_true
end
end
end