Index: openacs-4/www/site-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/site-master.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/www/site-master.tcl	17 Sep 2003 11:20:15 -0000	1.2
+++ openacs-4/www/site-master.tcl	17 Sep 2003 12:13:10 -0000	1.3
@@ -41,13 +41,15 @@
 }
 
 # Site-wide admin link
-set swadmin_url {}
+set admin_url {}
 if { $user_id != 0 } {
-    array set swadmin_node [site_node::get -url /acs-admin]
+    array set swadmin_node [site_node::get -url [apm_package_url_from_key "acs-admin"]]
     set swadmin_object_id $swadmin_node(object_id)
     set sw_admin_p [permission::permission_p -party_id $user_id -object_id $swadmin_object_id -privilege admin]
     if { $sw_admin_p } {
-        set sw_admin_url "/acs-admin"
+        set admin_url "/acs-admin/"
+    } elseif { [permission::permission_p -party_id $user_id -object_id [ad_conn subsite_id] -privilege admin] } {
+        set admin_url "[subsite::get_element -element url]admin/"
     }
 }