svn commit: r1036436 - /ofbiz/branches/jquery/applications/content/webapp/content/website/WebSiteCMSContent.ftl

Author: jleroux
Date: Thu Nov 18 12:36:49 2010
New Revision: 1036436

URL: http://svn.apache.org/viewvc?rev=1036436&view=rev
Log:
Of course the right solution was to use StringUtil.wrapString.
I completely forgot about that, Ashish reminded me with r1036426

This with r1036420 closes OFBIZ-3815.

We have still to handle labels and alert messages i18n though...

Modified:
    ofbiz/branches/jquery/applications/content/webapp/content/website/WebSiteCMSContent.ftl

Modified: ofbiz/branches/jquery/applications/content/webapp/content/website/WebSiteCMSContent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/webapp/content/website/WebSiteCMSContent.ftl?rev=1036436&r1=1036435&r2=1036436&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/webapp/content/website/WebSiteCMSContent.ftl (original)
+++ ofbiz/branches/jquery/applications/content/webapp/content/website/WebSiteCMSContent.ftl Thu Nov 18 12:36:49 2010
@@ -353,9 +353,7 @@
                 <div id="editorcontainer" class="nocolumns">
                     <div id="cmseditor" style="margin: 0; width: 100%; border: 1px solid black;">
                     <#if (dataText?has_content)>
-                        ${dataText.textData!}
-                        <#--${dataText.textData!?replace("&lt;", "<", "rm")?replace("&gt;", ">", "rm")?replace("&amp;", "&", "rm")?replace("&quot;", '"', "rm")?replace("&apos;", "'")}
-                        ${dataText.textData!?replace("\\&lt;", "<", "rm")?replace("\\&gt;", ">", "rm")?replace("\\&amp;", "&", "rm")?replace("\\&quot;", '"', "rm")?replace("\\&apos;", "'")}-->
+                      ${StringUtil.wrapString(dataText.textData!)}
                     </#if>
                     </div>
                 </div>