Merged V2.1 to HEAD

6933:  Various fixes for cross-site javascript and associated trickery to web-client UI screens
Plus fixes to several dialogs broken in use-the-link dialog conversion changes.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7362 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/web/bean/wcm/InviteWebsiteUsersWizard.java

@@ -45,6 +45,7 @@ import org.alfresco.service.namespace.RegexQNamePattern;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.repository.Node;
 import org.alfresco.web.bean.wizard.InviteUsersWizard;
+import org.alfresco.web.ui.common.Utils;
 
 /**
  * Bean providing the ability to invite users to a web project space.
@@ -313,7 +314,7 @@ public class InviteWebsiteUsersWizard extends InviteUsersWizard
          {
             foundCurrentUser = true;
          }
-         buf.append(userRole.getLabel());
+         buf.append(Utils.encode(userRole.getLabel()));
          buf.append("<br>");
       }
       if (isStandalone() == false && foundCurrentUser == false)