BUG: staff should not be allowed to edit emails when email_editable is false

2014-08-15 12:41:01 +10:00 · 2014-08-15 12:41:01 +10:00 · 0e5ab97a87
parent e16dd96b6d
commit 0e5ab97a87
1 changed files with 1 additions and 1 deletions
--- a/lib/guardian/user_guardian.rb
+++ b/lib/guardian/user_guardian.rb
@ -14,8 +14,8 @@ module UserGuardian

  def can_edit_email?(user)
    return false if (SiteSetting.sso_overrides_email? && SiteSetting.enable_sso?)
-    return true if is_staff?
    return false unless SiteSetting.email_editable?
+    return true if is_staff?
    can_edit?(user)
  end