Index: openacs-4/packages/ecommerce/www/product.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/product.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/ecommerce/www/product.adp	12 Aug 2008 11:45:36 -0000	1.8
+++ openacs-4/packages/ecommerce/www/product.adp	19 Oct 2008 10:23:27 -0000	1.9
@@ -8,9 +8,10 @@
   <property name="category_id">@category_id@</property>
   <property name="subcategory_id">@subcategory_id@</property>  
 
-<include src="/packages/ecommerce/lib/toolbar"/>
-<include src="/packages/ecommerce/lib/searchbar"/>
+<include src="/packages/ecommerce/lib/toolbar">
+<include src="/packages/ecommerce/lib/searchbar" category_id="@category_id@" subcategory_id="@subcategory_id@" search_text="@search_text@">
 
-  <% eval $product_code %>
+  @product_code_output;noquote@
 
 <include src="/packages/ecommerce/lib/product-files-list" product_id="@product_id@">
+
Index: openacs-4/packages/ecommerce/www/product.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/product.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/ecommerce/www/product.tcl	11 Aug 2008 13:01:10 -0000	1.13
+++ openacs-4/packages/ecommerce/www/product.tcl	19 Oct 2008 10:23:27 -0000	1.14
@@ -193,10 +193,12 @@
     where rownum = 1" {
 }
 
-db_release_unused_handles
+
 set title $product_name
 set context [list $title]
 set ec_system_owner [ec_system_owner]
 
 # TODO should memoize this
 set product_code [template::adp_compile -string $template]
+set product_code_output [template::adp_eval product_code]
+db_release_unused_handles
\ No newline at end of file