You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by by...@apache.org on 2007/03/08 21:24:22 UTC
svn commit: r516167 - in
/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum:
comboprep.bsh contentprep.bsh
Author: byersa
Date: Thu Mar 8 12:24:19 2007
New Revision: 516167
URL: http://svn.apache.org/viewvc?view=rev&rev=516167
Log:
Fixing the call to renderContentAsText 6 places.
Modified:
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/comboprep.bsh
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/contentprep.bsh
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/comboprep.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/comboprep.bsh?view=diff&rev=516167&r1=516166&r2=516167
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/comboprep.bsh (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/comboprep.bsh Thu Mar 8 12:24:19 2007
@@ -150,7 +150,7 @@
subContentDataResourceView = ContentWorker.getSubContent(delegator, contentId, "ARTICLE", null, userLogin, assocTypes, fromDate);
if ( subContentDataResourceView != null) {
out = new StringWriter();
- ContentWorker.renderContentAsText(delegator, null, out, templateRoot, subContentDataResourceView, locale, mimeTypeId);
+ ContentWorker.renderContentAsText(dispatcher, delegator, null, out, templateRoot, subContentDataResourceView, locale, mimeTypeId, true);
textData = out.toString();
singleWrapper.putInContext("txtContentId", subContentDataResourceView.get("contentId"));
singleWrapper.putInContext("txtDataResourceId", subContentDataResourceView.get("dataResourceId"));
@@ -161,7 +161,7 @@
subContentDataResourceView = ContentWorker.getSubContent(delegator, contentId, "SUMMARY", null, userLogin, assocTypes, fromDate);
if ( subContentDataResourceView != null) {
out = new StringWriter();
- ContentWorker.renderContentAsText(delegator, null, out, templateRoot, subContentDataResourceView, locale, mimeTypeId);
+ ContentWorker.renderContentAsText(dispatcher, delegator, null, out, templateRoot, subContentDataResourceView, locale, mimeTypeId, true);
summaryData = out.toString();
singleWrapper.putInContext("sumContentId", subContentDataResourceView.get("contentId"));
singleWrapper.putInContext("sumDataResourceId", subContentDataResourceView.get("dataResourceId"));
@@ -171,7 +171,7 @@
subContentDataResourceView = ContentWorker.getSubContent(delegator, contentId, "IMAGE", null, userLogin, assocTypes, fromDate);
if ( subContentDataResourceView != null) {
out = new StringWriter();
- ContentWorker.renderContentAsText(delegator, null, out, templateRoot, subContentDataResourceView, locale, mimeTypeId);
+ ContentWorker.renderContentAsText(dispatcher, delegator, null, out, templateRoot, subContentDataResourceView, locale, mimeTypeId, true);
imageData = out.toString();
singleWrapper.putInContext("imgContentId", subContentDataResourceView.get("contentId"));
singleWrapper.putInContext("imgDataResourceId", subContentDataResourceView.get("dataResourceId"));
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/contentprep.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/contentprep.bsh?view=diff&rev=516167&r1=516166&r2=516167
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/contentprep.bsh (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/contentprep.bsh Thu Mar 8 12:24:19 2007
@@ -102,7 +102,7 @@
subContentDataResourceView = ContentWorker.getSubContent(delegator, contentId, "ARTICLE", null, userLogin, assocTypes, fromDate);
if (subContentDataResourceView != null) {
out = new StringWriter();
- ContentWorker.renderContentAsText(delegator, null, out, templateRoot, subContentDataResourceView, locale, mimeTypeId);
+ ContentWorker.renderContentAsText(dispatcher, delegator, null, out, templateRoot, subContentDataResourceView, locale, mimeTypeId, true);
textData = out.toString();
context.put("txtContentId", subContentDataResourceView.get("contentId"));
context.put("txtDataResourceId", subContentDataResourceView.get("dataResourceId"));
@@ -115,7 +115,7 @@
}
}
- subContentDataResourceView = ContentWorker.getSubContent(delegator, contentId, "SUMMARY", null, userLogin, assocTypes, fromDate);
+ subContentDataResourceView = ContentWorker.getSubContent(dispatcher, delegator, contentId, "SUMMARY", null, userLogin, assocTypes, fromDate, true);
if (subContentDataResourceView != null) {
out = new StringWriter();
ContentWorker.renderContentAsText(delegator, null, out, templateRoot, subContentDataResourceView, locale, mimeTypeId);
@@ -131,7 +131,7 @@
}
}
- subContentDataResourceView = ContentWorker.getSubContent(delegator, contentId, "IMAGE", null, userLogin, assocTypes, fromDate);
+ subContentDataResourceView = ContentWorker.getSubContent(dispatcher, delegator, contentId, "IMAGE", null, userLogin, assocTypes, fromDate, true);
if (subContentDataResourceView != null) {
out = new StringWriter();
ContentWorker.renderContentAsText(delegator, null, out, templateRoot, subContentDataResourceView, locale, mimeTypeId);