Merged V3.0 to HEAD

12310: Merged V2.2 to V3.0
    12306: Merged V2.1 to V2.2
      12212: Final set of XSS and HTML encoding fixes for ETWOONE-90
  12312: Merged V2.2 to V3.0
    12311: Merged V2.1 to V2.2
      11667: Fix for ETWOONE-389 - Current page number not always visible on the browse screen.
  12316: Fix for merge issue
  12317: Merged 2.1 to 3.0
    12313: Fix for regression introduced when fixing ETWOONE-91. Also fixes ETHREEOH-1043
  12319: Final set of XSS fixes specific to 3.0 codeline see ETWOONE-90
  12321: Missing file from previous checkin
  12324: Merged 2.2 to 3.0
    12320: Merged 2.1 to 2.2
      11682: Fix for ETWOONE-87: Behavior of delete cascade
  12326: Merge 2.1 to 3.0
    11615: Fix for ETWOONE-188: After session has timed out, expanding a space in the Navigator results in unfriendly error


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

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

@@ -866,8 +866,19 @@ public class CreateWebContentWizard extends CreateContentWizard
       final ResourceBundle bundle = Application.getBundle(FacesContext.getCurrentInstance());
 
       // TODO: show first few lines of content here?
-      return this.buildSummary(new String[] { bundle.getString("file_name"), bundle.getString("type"), bundle.getString("content_type") }, new String[] { this.getFileName(),
-            this.getSummaryObjectType(), this.getSummaryMimeType(this.mimeType) });
+      return this.buildSummary(
+            new String[] 
+            {
+               bundle.getString("file_name"), 
+               bundle.getString("type"), 
+               bundle.getString("content_type")
+            },
+            new String[] 
+            {
+               Utils.encode(this.getFileName()), 
+               this.getSummaryObjectType(), 
+               this.getSummaryMimeType(this.mimeType)
+            });
    }
 
    public boolean getEditMode()