mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V3.0 to HEAD
11550: Fixes for Site title/description related XSS issues. 11551: ETHREEOH-534 - Fix bootstrap errors when audit enabled 11552: Invitee link in activity list now directs you to the correct user when a user is invited to a site 11555: Disable usage checking and quotas and related jobs - ETHREEOH-653 11556: Upgrade scripts for Oracle and SQL Server. Fixes ETHREEOH-643 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12474 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -989,6 +989,7 @@ public class SiteServiceImpl implements SiteService, SiteModel
|
||||
{
|
||||
JSONObject activityData = new JSONObject();
|
||||
activityData.put("role", role);
|
||||
activityData.put("memberUserName", userName);
|
||||
activityData.put("memberFirstName", memberFN);
|
||||
activityData.put("memberLastName", memberLN);
|
||||
activityData.put("title", (memberFN + " " + memberLN + " (" + userName + ")").trim());
|
||||
|
Reference in New Issue
Block a user