Index: openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl,v
diff -u -r1.11 -r1.11.2.1
--- openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl	4 Oct 2003 03:10:01 -0000	1.11
+++ openacs-4/packages/acs-admin/tcl/apm-admin-procs.tcl	9 Dec 2003 12:05:40 -0000	1.11.2.1
@@ -51,7 +51,11 @@
     } else {
         set title [lindex $args end]
         set context [concat [list [list $apm_url $apm_title]] $args]
-        set context_bar [eval ad_context_bar $context]
+        set cmd [list ad_context_bar --]
+        foreach elem $context {
+            lappend cmd $elem
+        }
+        set context_bar [eval $cmd]
     }
     set header [ad_header $title ""]
     append body "$header\n"
Index: openacs-4/packages/acs-subsite/www/group-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/group-master.tcl,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/acs-subsite/www/group-master.tcl	10 Oct 2003 09:02:18 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/group-master.tcl	9 Dec 2003 12:05:40 -0000	1.6.2.1
@@ -28,8 +28,13 @@
 # Context bar
 if { [template::util::is_nil no_context_p] } {
     if { ![template::util::is_nil context] } {
-        set context_bar [eval ad_context_bar -from_node $subsite_node_id $context]
+        set cmd [list ad_context_bar -from_node $subsite_node_id --]
+        foreach elem $context {
+            lappend cmd $elem
+        }
+        set context_bar [eval $cmd]
     }
+
     if [template::util::is_nil context_bar] { 
         set context_bar [ad_context_bar -from_node $subsite_node_id]
     }
Index: openacs-4/packages/acs-templating/tcl/query-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/query-procs.tcl,v
diff -u -r1.17.2.1 -r1.17.2.2
--- openacs-4/packages/acs-templating/tcl/query-procs.tcl	26 Nov 2003 15:02:44 -0000	1.17.2.1
+++ openacs-4/packages/acs-templating/tcl/query-procs.tcl	9 Dec 2003 12:05:40 -0000	1.17.2.2
@@ -631,7 +631,7 @@
     <dt> <b>template::multirow append datasourcename value [value ...]</b></dt>
     <dd> appends the row to an existing multirow.</dd>
     <dt> <b>template::multirow pop datasourcename </b></dt>
-    <dd> pops a row off an existing multirow, returning a list of the rows keys and values</dd>
+    <dd> pops a row off an existing multirow, returning a list of the rows keys gand values</dd>
     <dt> <b>template::multirow size datasourcename</b></dt>
     <dd> returns the rowcount</dd>
     <dt> <b>template::multirow columns datasourcename</b></dt>
Index: openacs-4/packages/bookmarks/www/bookmarks-check.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-check.tcl,v
diff -u -r1.4 -r1.4.6.1
--- openacs-4/packages/bookmarks/www/bookmarks-check.tcl	10 Sep 2002 22:22:26 -0000	1.4
+++ openacs-4/packages/bookmarks/www/bookmarks-check.tcl	9 Dec 2003 12:05:40 -0000	1.4.6.1
@@ -55,12 +55,18 @@
 
 # We want to give the user something to look at before we start contacting
 # the foreign hosts
+set cmd [list ad_context_bar --]
+foreach elem [bm_context_bar_args "\"$page_title\"" $viewed_user_id] {
+    lappend cmd $elem
+}
+set context_bar [eval $cmd]
+
 ReturnHeaders
 ns_write "[ad_header $page_title]
-
+$context_bar
 <h2>$page_title</h2>
 
-[eval ad_context_bar [bm_context_bar_args "\"$page_title\"" $viewed_user_id]]
+
 <hr>
 "
 
Index: openacs-4/packages/ecommerce/www/contextbar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/Attic/contextbar.tcl,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/ecommerce/www/contextbar.tcl	10 Dec 2002 20:06:18 -0000	1.3
+++ openacs-4/packages/ecommerce/www/contextbar.tcl	9 Dec 2003 12:05:40 -0000	1.3.2.1
@@ -18,7 +18,11 @@
 if {[empty_string_p $context_addition]} {
     set context_bar [ad_context_bar]
 } else {
-    set context_bar [eval ad_context_bar $context_addition]
+    set cmd [list ad_context_bar --]
+    foreach elem $context_addition {
+        lappend cmd $elem
+    }
+    set context_bar [eval $cmd]
 }
 
 # Check for admin rights to this (the ecommerce) package.
Index: openacs-4/packages/ecommerce/www/doc/contextbar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/contextbar.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/ecommerce/www/doc/contextbar.tcl	10 Dec 2002 20:05:21 -0000	1.2
+++ openacs-4/packages/ecommerce/www/doc/contextbar.tcl	9 Dec 2003 12:05:40 -0000	1.2.2.1
@@ -18,7 +18,11 @@
 if {[empty_string_p $context_addition]} {
     set context_bar [ad_context_bar]
 } else {
-    set context_bar [eval ad_context_bar $context_addition]
+    set cmd [list ad_context_bar --]
+    foreach elem $context_addition {
+        lappend cmd $elem
+    }
+    set context_bar [eval $cmd]
 }
 
 # Check for admin rights to this (the ecommerce) package.
Index: openacs-4/packages/photo-album/www/pa_master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/pa_master.tcl,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/photo-album/www/pa_master.tcl	10 Jun 2003 10:07:11 -0000	1.1
+++ openacs-4/packages/photo-album/www/pa_master.tcl	9 Dec 2003 12:05:40 -0000	1.1.2.1
@@ -1 +1,7 @@
-set context_bar [eval ad_context_bar $context_list]
+set cmd [list ad_context_bar --]
+foreach elem $context_list {
+    lappend cmd $elem
+}
+set context_bar [eval $cmd]
+
+
Index: openacs-4/www/site-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/site-master.tcl,v
diff -u -r1.9.2.1 -r1.9.2.2
--- openacs-4/www/site-master.tcl	24 Nov 2003 17:33:10 -0000	1.9.2.1
+++ openacs-4/www/site-master.tcl	9 Dec 2003 12:05:40 -0000	1.9.2.2
@@ -68,7 +68,11 @@
 # Context bar
 if { [template::util::is_nil no_context_p] } {
     if { ![template::util::is_nil context] } {
-        set context_bar [eval ad_context_bar -from_node $subsite_node_id $context]
+        set cmd [list ad_context_bar -from_node $subsite_node_id --]
+        foreach elem $context {
+            lappend cmd $elem
+        }
+        set context_bar [eval $cmd]
     }
     if [template::util::is_nil context_bar] { 
         set context_bar [ad_context_bar -from_node $subsite_node_id]