svn commit: r998585 - /ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java

[hansbak]

Author: hansbak
Date: Sun Sep 19 02:52:49 2010
New Revision: 998585

URL: http://svn.apache.org/viewvc?rev=998585&view=rev
Log:
<subcontent not working, was showing in the new article function of the content 
blog part

Modified:
    
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java

Modified: 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java?rev=998585&r1=998584&r2=998585&view=diff
==============================================================================
--- 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
 (original)
+++ 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
 Sun Sep 19 02:52:49 2010
@@ -478,7 +478,7 @@ public class MacroScreenRenderer impleme
          Map<String, Object> parameters = FastMap.newInstance();
          parameters.put("editContainerStyle", 
content.getEditContainerStyle(context));
          parameters.put("editRequest", content.getEditRequest(context));
-         parameters.put("enableEditValue", enableEditValue);
+         parameters.put("enableEditValue", enableEditValue == null ? "" : 
enableEditValue);
          executeMacro(writer, "renderSubContentBegin", parameters);
     }
 
@@ -562,7 +562,7 @@ public class MacroScreenRenderer impleme
          parameters.put("editMode", editMode);
          parameters.put("editContainerStyle", 
content.getEditContainerStyle(context));
          parameters.put("editRequest", editRequest);
-         parameters.put("enableEditValue", enableEditValue);
+         parameters.put("enableEditValue", enableEditValue == null ? "" : 
enableEditValue);
          executeMacro(writer, "renderSubContentEnd", parameters);
     }