Index: openacs-4/packages/xotcl-core/tcl/context-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/context-procs.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/xotcl-core/tcl/context-procs.tcl	8 May 2007 11:21:47 -0000	1.17
+++ openacs-4/packages/xotcl-core/tcl/context-procs.tcl	25 May 2007 10:14:14 -0000	1.18
@@ -189,7 +189,7 @@
           -package_id $package_id \
           -url $url \
 	  -actual_query $actual_query \
-          -parameter_declaration $parameter
+          [list -parameter_declaration $parameter]
       ::xo::cc set_user_id $user_id
       ::xo::cc process_query_parameter
     }
Index: openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/Attic/xowiki-portlet-procs.tcl,v
diff -u -r1.55 -r1.56
--- openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl	18 May 2007 09:07:44 -0000	1.55
+++ openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl	25 May 2007 10:13:30 -0000	1.56
@@ -982,7 +982,7 @@
 
     if {$summary} {
       set count [db_string [my qn presence_count_users] \
-                     "select count(distinct user_id) from xowiki_last_visited  $where_clause"]
+                     "select count(distinct user_id) from xowiki_last_visited WHERE $where_clause"]
     } else {
       set values [db_list_of_lists [my qn get_users] \
                       [::xo::db::sql select \
Index: openacs-4/packages/xowiki/www/admin/test.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/Attic/test.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/xowiki/www/admin/test.tcl	7 Apr 2007 12:27:16 -0000	1.3
+++ openacs-4/packages/xowiki/www/admin/test.tcl	25 May 2007 10:13:31 -0000	1.4
@@ -86,7 +86,7 @@
 ? {site_node::exists_p -url /$instance_name} 0 \
     "the test instance does not exist"
 
-set root_id [db_string get_root {select node_id, name from site_nodes where name = ''}]
+set root_id [site_node::get_root_node_id]
 if {[db_0or1row check_broken_site_nodes {
      select node_id, name from site_nodes where name = :instance_name and parent_id = :root_id
 }]} {