From fd031bcee8336942fddff0ce551a7dfefcddee56 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Sat, 15 Mar 2014 01:49:05 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)    64434:
 Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)       62644: Fixed the
 CloudInvitationServiceImplTest test failures in the build. Also changed the
 Mange Sites required APIs which were wrapped in runAs System user (committed
 in r62555), to Admin.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64580 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/java/org/alfresco/repo/site/SiteServiceImpl.java   | 8 +++-----
 .../org/alfresco/repo/site/script/ScriptSiteService.java  | 4 ++--
 source/java/org/alfresco/repo/site/script/Site.java       | 4 ++--
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/source/java/org/alfresco/repo/site/SiteServiceImpl.java b/source/java/org/alfresco/repo/site/SiteServiceImpl.java
index 989cf82b22..5b63a64ef2 100644
--- a/source/java/org/alfresco/repo/site/SiteServiceImpl.java
+++ b/source/java/org/alfresco/repo/site/SiteServiceImpl.java
@@ -2299,11 +2299,9 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
         // -- the member does not already have permissions
         // ... then we can set the permissions as system user
         final String currentUserName = AuthenticationUtil.getFullyAuthenticatedUser();
-        return (isSiteAdmin(currentUserName)
-                    || (permissionService.hasPermission(siteNodeRef, PermissionService.CHANGE_PERMISSIONS) == AccessStatus.ALLOWED)
-                    || (SiteVisibility.PUBLIC.equals(visibility)
-                    && role.equals(SiteModel.SITE_CONSUMER)
-                    && authorityName.equals(currentUserName) && currentRole == null));
+        return ((permissionService.hasPermission(siteNodeRef, PermissionService.CHANGE_PERMISSIONS) == AccessStatus.ALLOWED)
+                    || isSiteAdmin(currentUserName) || (SiteVisibility.PUBLIC.equals(visibility)
+                    && role.equals(SiteModel.SITE_CONSUMER) && authorityName.equals(currentUserName) && currentRole == null));
     }
     
     /**
diff --git a/source/java/org/alfresco/repo/site/script/ScriptSiteService.java b/source/java/org/alfresco/repo/site/script/ScriptSiteService.java
index cda93016b2..281b6f4ba1 100644
--- a/source/java/org/alfresco/repo/site/script/ScriptSiteService.java
+++ b/source/java/org/alfresco/repo/site/script/ScriptSiteService.java
@@ -227,7 +227,7 @@ public class ScriptSiteService extends BaseScopableProcessorExtension
                 {
                     return getSites(filter, sitePresetFilter, size);
                 }
-            }, AuthenticationUtil.getSystemUserName());
+            }, AuthenticationUtil.getAdminUserName());
         }
         else
         {
@@ -362,7 +362,7 @@ public class ScriptSiteService extends BaseScopableProcessorExtension
                 {
                     return siteService.getSite(shortName);
                 }
-            }, AuthenticationUtil.getSystemUserName());
+            }, AuthenticationUtil.getAdminUserName());
         }
         else
         {
diff --git a/source/java/org/alfresco/repo/site/script/Site.java b/source/java/org/alfresco/repo/site/script/Site.java
index 9d28e00165..c817d84a08 100644
--- a/source/java/org/alfresco/repo/site/script/Site.java
+++ b/source/java/org/alfresco/repo/site/script/Site.java
@@ -311,7 +311,7 @@ public class Site implements Serializable
                         siteService.updateSite(siteInfo);
                         return null;
                     }
-                }, AuthenticationUtil.getSystemUserName());
+                }, AuthenticationUtil.getAdminUserName());
             }
             else
             {
@@ -338,7 +338,7 @@ public class Site implements Serializable
                     siteService.deleteSite(siteInfo.getShortName());
                     return null;
                 }
-            }, AuthenticationUtil.getSystemUserName());
+            }, AuthenticationUtil.getAdminUserName());
         }
         else
         {