mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V2.2 to HEAD
8019: Merged V2.1 to V2.2 7715: Fix for AWC-1753 7725: Additional files for AWC-1753 - also fixes unreported issue of OK button not being highlighted when editing post until you press a key 7726: Additional files for AWC-1753 - also fixes unreported issue of OK button not being highlighted when editing post until you press a key 7731: Added support for Range and Content-Range headers to support Download managers and Resume features for HTTP downloads 7967: Workaround for ACT-771: Missing AVM Store system descriptor properties prevents system startup 7980: AWC-1662: Fixed NPE when searching for users 7981: Fix for AWC-1661: Can't edit details of user who has had their home space removed 7988: NodeRef + child path relative URLs support for DownloadContentServlet 8003: Fix for AWC-1795 8004: Fix http://issues.alfresco.com/browse/AR-1807 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8461 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -121,7 +121,7 @@ public class ErrorBean implements Serializable
|
||||
// format the message for HTML display
|
||||
message = message.replaceAll("<", "<");
|
||||
message = message.replaceAll(">", ">");
|
||||
message = message.replaceAll("\n", "<br/>");
|
||||
message = message.replaceAll("\n", "<br>");
|
||||
}
|
||||
|
||||
return message;
|
||||
@@ -144,7 +144,7 @@ public class ErrorBean implements Serializable
|
||||
trace = stringWriter.toString();
|
||||
trace = trace.replaceAll("<", "<");
|
||||
trace = trace.replaceAll(">", ">");
|
||||
trace = trace.replaceAll("\n", "<br/>");
|
||||
trace = trace.replaceAll("\n", "<br>");
|
||||
}
|
||||
|
||||
return trace;
|
||||
|
Reference in New Issue
Block a user