Index: openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl	8 Feb 2005 01:19:43 -0000	1.19
+++ openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl	8 Feb 2005 01:22:52 -0000	1.20
@@ -95,7 +95,7 @@
     
     @see ad_context_bar_html
 } {
-    if {![parameter::get -package_id [ad_conn subsite_id] -parameter ShowContextBarP -default 1]} {
+    if {![parameter::get -package_id [site_node_closest_ancestor_package "acs-subsite"] -parameter ShowContextBarP -default 1]} {
 	return ""
     }
     
@@ -141,7 +141,7 @@
     
     @see ad_context_bar_html
 } {
-    if {![parameter::get -package_id [ad_conn subsite_id] -parameter ShowContextBarP -default 1]} {
+    if {![parameter::get -package_id [site_node_closest_ancestor_package "acs-subsite"] -parameter ShowContextBarP -default 1]} {
 	return ""
     }
 
Index: openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl,v
diff -u -r1.68 -r1.69
--- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	8 Feb 2005 01:19:43 -0000	1.68
+++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	8 Feb 2005 01:22:52 -0000	1.69
@@ -1220,7 +1220,7 @@
                     subsite_id {
                         set ad_conn(subsite_id) [site_node::closest_ancestor_package \
                                                      -node_id [ad_conn node_id] \
-                                                     -package_key [subsite::package_keys] \
+                                                     -package_key "acs-subsite" \
                                                      -include_self \
                                                      -element "package_id"]
                         return $ad_conn(subsite_id)