From 0e5ab97a87d69a09fd01f44f5f57c8369b284c27 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 15 Aug 2014 12:41:01 +1000 Subject: [PATCH] BUG: staff should not be allowed to edit emails when email_editable is false --- lib/guardian/user_guardian.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/guardian/user_guardian.rb b/lib/guardian/user_guardian.rb index 23c964e1236..2b624c0012b 100644 --- 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