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

Merged 5.2.0 (5.2.0) to HEAD (5.2)

Browse Source 
133996 rneamtu: ACE-5416: Merged 5.2.N (5.2.1) to 5.2.0 (5.2.0)
      133567 rneamtu: ACE-5639: Comment Activitiy Feed Entries made outside of site show @@NULL@@
         - If siteInfo does not exists do not post comment related activity


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@134203 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2017-01-11 10:37:06 +00:00
parent 3543b19fa7
commit 5584458b2f
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/java/org/alfresco/repo/web/scripts/comments/AbstractCommentsWebScript.java
View File

@@ -234,14 +234,14 @@ public abstract class AbstractCommentsWebScript extends DeclarativeWebScript
SiteInfo siteInfo = getSiteInfo(req, COMMENT_CREATED_ACTIVITY.equals(activityType));
// post an activity item, but only if we've got a site
if (siteInfo != null)
{
siteId = siteInfo.getShortName();
if (siteId == null || siteId.length() == 0)
{
return;
}
// post an activity item, but only if we've got a site
if (siteInfo == null || siteInfo.getShortName() == null || siteInfo.getShortName().length() == 0)
{
return;
}
else
{
siteId = siteInfo.getShortName();
}
// json is not sent null with this activity type - only for delete