svn commit: r742030 - in /ofbiz/trunk/framework: common/webcommon/includes/appbar.ftl widget/src/org/ofbiz/widget/screen/HtmlWidget.java

[jonesde]

Author: jonesde
Date: Sun Feb  8 09:05:45 2009
New Revision: 742030

URL: http://svn.apache.org/viewvc?rev=742030&view=rev
Log:
Fixed appbar issue with html encoding, so general encoding turned back on too

Modified:
    ofbiz/trunk/framework/common/webcommon/includes/appbar.ftl
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java

Modified: ofbiz/trunk/framework/common/webcommon/includes/appbar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/appbar.ftl?rev=742030&r1=742029&r2=742030&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/appbar.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/appbar.ftl Sun Feb  8 09:05:45 2009
@@ -45,7 +45,7 @@
           <#if thisApp != "/">
             <#assign thisURL = thisURL + "/control/main">
           </#if>
-          <li<#if selected> class="selected"</#if>><a href="${response.encodeURL(thisURL + externalKeyParam)}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a></li>
+          <li<#if selected> class="selected"</#if>><a href="${thisURL}${externalKeyParam}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a></li>
         </#if>
       </#list>
     </ul>

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java?rev=742030&r1=742029&r2=742030&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java Sun Feb  8 09:05:45 2009
@@ -68,9 +68,9 @@
             }*/
             // This StringHtmlWrapperForFtl option seems to be the best option
             // and handles most things without causing too many problems
-            //if (object instanceof String) {
-            //    return new StringHtmlWrapperForFtl((String) object, this);
-            //}
+            if (object instanceof String) {
+                return new StringHtmlWrapperForFtl((String) object, this);
+            }
             return super.wrap(object);
         }
     }