Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.349 -r1.350
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	23 Apr 2009 07:29:28 -0000	1.349
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	23 Apr 2009 07:41:09 -0000	1.350
@@ -2258,7 +2258,7 @@
        -form_fields 
        {-publish_status ready}
        {-extra_where_clause ""}
-       {-h_where ""}
+       {-h_where {tcl true h "" vars "" sql ""}}
        {-always_queried_attributes ""}
        {-orderby ""}
        {-page_size 20}
@@ -2313,13 +2313,11 @@
     # 
     set publish_status_clause [::xowiki::Includelet publish_status_clause -base_table ci $publish_status]
     set filter_clause ""
-    # provide default for sql part of where-clause
-    array set wc [list sql ""]
     array set wc $h_where
     set use_hstore [expr {[::xo::db::has_hstore] && 
                           [$package_id get_parameter use_hstore 0] 
                         }]
-    if {$h_where ne "" && $use_hstore} {
+    if {$use_hstore} {
       set filter_clause " and '$wc(h)' <@ bt.hkey"
     }
     #my msg "exists sql=[info exists wc(sql)]"
@@ -2345,10 +2343,10 @@
 		    -page_number $page_number \
 		    -base_table xowiki_form_pagei \
                  ]
-    my log $sql
+    #my log $sql
     set items [::xowiki::FormPage instantiate_objects -sql $sql \
                    -object_class ::xowiki::FormPage]
-    if {$h_where ne "" && !$use_hstore} {
+    if {!$use_hstore && $wc(tcl) ne "true"} {
       set init_vars $wc(vars)
       foreach p [$items children] {
         array set __ia $init_vars