mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
Revert "Merge pull request #2116 from LessonPlanet/disable-name-edit-for-sso"
This reverts commit91aa21671a, reversing changes made tof19596af0d.
This commit is contained in:
@@ -19,13 +19,6 @@ module UserGuardian
|
||||
can_edit?(user)
|
||||
end
|
||||
|
||||
def can_edit_name?(user)
|
||||
return false if not(SiteSetting.enable_names?)
|
||||
return false if (SiteSetting.sso_overrides_name? && SiteSetting.enable_sso?)
|
||||
return true if is_staff?
|
||||
can_edit?(user)
|
||||
end
|
||||
|
||||
def can_block_user?(user)
|
||||
user && is_staff? && not(user.staff?)
|
||||
end
|
||||
@@ -44,4 +37,4 @@ module UserGuardian
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
Reference in New Issue
Block a user