svn commit: r767695 - in /ofbiz/branches/release09.04: ./ framework/common/webcommon/includes/messages.ftl framework/webapp/src/org/ofbiz/webapp/event/ServiceEventHandler.java

Author: jleroux
Date: Wed Apr 22 22:30:41 2009
New Revision: 767695

URL: http://svn.apache.org/viewvc?rev=767695&view=rev
Log:
Applied fix from trunk for revision: 767694  

Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/framework/common/webcommon/includes/messages.ftl
    ofbiz/branches/release09.04/framework/webapp/src/org/ofbiz/webapp/event/ServiceEventHandler.java

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 22 22:30:41 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767671,767688
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767671,767688,767694

Modified: ofbiz/branches/release09.04/framework/common/webcommon/includes/messages.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/common/webcommon/includes/messages.ftl?rev=767695&r1=767694&r2=767695&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/common/webcommon/includes/messages.ftl (original)
+++ ofbiz/branches/release09.04/framework/common/webcommon/includes/messages.ftl Wed Apr 22 22:30:41 2009
@@ -40,11 +40,11 @@
   <div class="content-messages errorMessage">
     <p>${uiLabelMap.CommonFollowingErrorsOccurred}:</p>
     <#if errorMessage?has_content>
-      <p>${errorMessage}</p>
+      <p>${StringUtil.wrapString(errorMessage)}</p>
     </#if>
     <#if errorMessageList?has_content>
       <#list errorMessageList as errorMsg>
-        <p>${errorMsg}</p>
+        <p>${StringUtil.wrapString(errorMsg)}</p>
       </#list>
     </#if>
   </div>
@@ -55,11 +55,11 @@
   <div class="content-messages eventMessage">
     <p>${uiLabelMap.CommonFollowingOccurred}:</p>
     <#if eventMessage?has_content>
-      <p>${eventMessage}</p>
+      <p>${StringUtil.wrapString(eventMessage)}</p>
     </#if>
     <#if eventMessageList?has_content>
       <#list eventMessageList as eventMsg>
-        <p>${eventMsg}</p>
+        <p>${StringUtil.wrapString(eventMsg)}</p>
       </#list>
     </#if>
   </div>

Modified: ofbiz/branches/release09.04/framework/webapp/src/org/ofbiz/webapp/event/ServiceEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/webapp/src/org/ofbiz/webapp/event/ServiceEventHandler.java?rev=767695&r1=767694&r2=767695&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/webapp/src/org/ofbiz/webapp/event/ServiceEventHandler.java (original)
+++ ofbiz/branches/release09.04/framework/webapp/src/org/ofbiz/webapp/event/ServiceEventHandler.java Wed Apr 22 22:30:41 2009
@@ -403,7 +403,7 @@
                     + "\n(check before if a sub-task for this error does not exist)."
                     + "\nIf you are not sure how to create a Jira issue "
                     + "please have a look before at http://docs.ofbiz.org/x/r."
-                    + "\nThank you in advance for your help.";
+                    + "\n\nThank you in advance for your help.";
                 Debug.logError("=============== " + errMsg + "; In session [" + session.getId() + "]; Note that this can be changed using the service.http.parameters.require.encrypted property in the url.properties file", module);
 
                 // the default here is true, so anything but N/n is true