inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
64428: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      62552: Fixed SubscriptionServiceActivitiesTest failure in the build.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64574 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-03-15 01:42:31 +00:00
parent 263b73e5c1
commit eac1a27791
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/java/org/alfresco/repo/site/SiteServiceImpl.java
View File

@@ -1343,10 +1343,11 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
}
if (enforcePermissions)
{
// Note: Here we use AuthenticationUtil.getRunAsUser() to check for siteAdmin,
// as some codes like LocalFeedTaskProcessor.canReadSite dependent on runAsUser.
return siteNodeRef == null
|| !(this.permissionService.hasPermission(siteNodeRef,
PermissionService.READ_PROPERTIES).equals(AccessStatus.ALLOWED) || isSiteAdmin(AuthenticationUtil
.getFullyAuthenticatedUser())) ? null : siteNodeRef;
|| !(this.permissionService.hasPermission(siteNodeRef, PermissionService.READ_PROPERTIES)
.equals(AccessStatus.ALLOWED) || isSiteAdmin(AuthenticationUtil.getRunAsUser())) ? null : siteNodeRef;
}
else
{