Index: openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl	17 Sep 2003 12:13:25 -0000	1.6
+++ openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl	18 Sep 2003 17:12:53 -0000	1.7
@@ -348,7 +348,7 @@
     # TODO: add an image
     # TODO: add link_p/selected_p for subsections
 
-    set base_url [site_node_closest_ancestor_package_url]
+    set base_url [subsite::get_element -element url]
 
     template::multirow create $sections_multirow name label title url selected_p link_p
 
@@ -409,7 +409,7 @@
         set info(url) "[string range $info(url) 0 [string last / $info(url)]]."
     }
     
-    if { [ad_conn node_id] == [ad_conn subsite_id] } {
+    if { [ad_conn node_id] == [site_node_closest_ancestor_package "acs-subsite"] } {
         set current_url [ad_conn extra_url]
     } else {
         # Need to prepend the path from the subsite to this package
@@ -513,7 +513,7 @@
         }
     }
 
-    set subsite_url [site_node_closest_ancestor_package_url]
+    set subsite_url [subsite::get_element -element url]
     array set subsite_sitenode [site_node::get -url $subsite_url]
     set subsite_node_id $subsite_sitenode(node_id)
 
@@ -528,7 +528,7 @@
                                                 selected_patterns *]
     }
 
-    if { [permission::permission_p -object_id [ad_conn subsite_id] -privilege admin] } {
+    if { [permission::permission_p -object_id [site_node_closest_ancestor_package "acs-subsite"] -privilege admin] } {
         lappend pageflow admin {
             label "Administration"
             url "admin/configure"