Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2080 from Xenograph/fix-sso-override 

Username/email change should not be allowed with SSO and username/email override enabled
This commit is contained in:
Sam 2014-03-10 10:32:08 +11:00
parent 57626a3930 23d7b17f1a
commit cbf269fdbf
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/guardian/user_guardian.rb
View File

@ -6,12 +6,14 @@ module UserGuardian
end end
def can_edit_username?(user) def can_edit_username?(user)
return false if (SiteSetting.sso_overrides_username? && SiteSetting.enable_sso?)
return true if is_staff? return true if is_staff?
return false if SiteSetting.username_change_period <= 0 return false if SiteSetting.username_change_period <= 0
is_me?(user) && (user.post_count == 0 || user.created_at > SiteSetting.username_change_period.days.ago) is_me?(user) && (user.post_count == 0 || user.created_at > SiteSetting.username_change_period.days.ago)
end end
def can_edit_email?(user) def can_edit_email?(user)
return false if (SiteSetting.sso_overrides_email? && SiteSetting.enable_sso?)
return true if is_staff? return true if is_staff?
return false unless SiteSetting.email_editable? return false unless SiteSetting.email_editable?
can_edit?(user) can_edit?(user)