Revert "Merge pull request #2116 from LessonPlanet/disable-name-edit-for-sso"

This reverts commit 91aa21671a, reversing
changes made to f19596af0d.
This commit is contained in:
Régis Hanol
2014-03-13 18:17:59 +01:00
parent 0293eb4a13
commit fd1c824187
3 changed files with 3 additions and 77 deletions

View File

@@ -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