mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V3.0 to HEAD
12145: Merged V2.2 to V3.0 (AuthenticationUtil) 12109: AuthenticationUtil and AuthenticationComponent refactor 12152: Removed Lucene usage from lookup of 'sites' root folder 12153: Fix InviteServiceTest by cleaning up leaking authentications 12159: Fix for broken usage pattern of the Threadlocal values in recent AuthenticationUtil refactor. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12508 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -224,7 +224,7 @@ public class PreferenceServiceImpl implements PreferenceService
|
||||
|
||||
// Can only set preferences if the currently logged in user matches the user name being updated or
|
||||
// the user already has write permissions on the person node
|
||||
String currentUserName = AuthenticationUtil.getCurrentUserName();
|
||||
String currentUserName = AuthenticationUtil.getFullyAuthenticatedUser();
|
||||
if (authenticationComponent.isSystemUserName(currentUserName) == true ||
|
||||
permissionService.hasPermission(personNodeRef, PermissionService.WRITE) == AccessStatus.ALLOWED ||
|
||||
userName.equals(currentUserName) == true)
|
||||
@@ -300,7 +300,7 @@ public class PreferenceServiceImpl implements PreferenceService
|
||||
|
||||
// Can only set preferences if the currently logged in user matches the user name being updated or
|
||||
// the user already has write permissions on the person node
|
||||
String currentUserName = AuthenticationUtil.getCurrentUserName();
|
||||
String currentUserName = AuthenticationUtil.getFullyAuthenticatedUser();
|
||||
if (authenticationComponent.isSystemUserName(currentUserName) == true ||
|
||||
permissionService.hasPermission(personNodeRef, PermissionService.WRITE) == AccessStatus.ALLOWED ||
|
||||
userName.equals(currentUserName) == true)
|
||||
|
Reference in New Issue
Block a user