FIX: staff should be immune to max_invites_per_day setting

This commit is contained in:
Arpit Jalan
2015-06-05 10:22:41 +05:30
parent f1637fc11e
commit 4d593d1c18
2 changed files with 10 additions and 4 deletions

View File

@@ -200,7 +200,7 @@ class Guardian
def can_invite_to_forum?(groups=nil)
authenticated? &&
SiteSetting.max_invites_per_day.to_i > 0 &&
(SiteSetting.max_invites_per_day.to_i > 0 || is_staff?) &&
!SiteSetting.enable_sso &&
SiteSetting.enable_local_logins &&
(
@@ -213,8 +213,8 @@ class Guardian
def can_invite_to?(object, group_ids=nil)
return false if ! authenticated?
return false unless ( SiteSetting.enable_local_logins && (!SiteSetting.must_approve_users? || is_staff?) )
return false if SiteSetting.max_invites_per_day.to_i == 0
return true if is_admin?
return false if (SiteSetting.max_invites_per_day.to_i == 0 && !is_staff?)
return false if ! can_see?(object)
return false if group_ids.present?