github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-21 18:12:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: A blocked user should not be able to moderate anything.

Browse Source
This commit is contained in:
Guo Xiang Tan
2016-06-20 15:41:17 +08:00
parent e72684f9dc
commit dfdc54957c
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/guardian.rb
View File

@ -25,6 +25,7 @@ class Guardian
def moderator?; false; end
def approved?; false; end
def staged?; false; end
def blocked?; false; end
def secure_category_ids; []; end
def topic_create_allowed_category_ids; []; end
def has_trust_level?(level); false; end
@ -62,6 +63,10 @@ class Guardian
@user.moderator?
end
def is_blocked?
@user.blocked?
end
def is_developer?
@user &&
is_admin? &&
@ -112,7 +117,7 @@ class Guardian
end
def can_moderate?(obj)
obj && authenticated? && (is_staff? || (obj.is_a?(Topic) && @user.has_trust_level?(TrustLevel[4])))
obj && authenticated? && !is_blocked? && (is_staff? || (obj.is_a?(Topic) && @user.has_trust_level?(TrustLevel[4])))
end
alias :can_move_posts? :can_moderate?
alias :can_see_flags? :can_moderate?
@ -269,7 +274,7 @@ class Guardian
# Can't send PMs to suspended users
(is_staff? || target.is_a?(Group) || !target.suspended?) &&
# Blocked users can only send PM to staff
(!@user.blocked? || target.staff?)
(!is_blocked? || target.staff?)
end
def can_see_emails?