Index: openacs-4/packages/acs-subsite/lib/subsites-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/subsites-oracle.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/lib/subsites-oracle.xql	7 Aug 2017 23:47:57 -0000	1.2
+++ openacs-4/packages/acs-subsite/lib/subsites-oracle.xql	11 Dec 2018 11:16:34 -0000	1.3
@@ -9,7 +9,6 @@
            p.instance_name,
            n.node_id, 
            n.name,
-           :subsite_url || n.name as url,
            (select count(*)
             from   group_approved_member_map m
             where  m.rel_type = 'membership_rel'
Index: openacs-4/packages/acs-subsite/lib/subsites-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/subsites-postgresql.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/lib/subsites-postgresql.xql	7 Aug 2017 23:47:57 -0000	1.2
+++ openacs-4/packages/acs-subsite/lib/subsites-postgresql.xql	11 Dec 2018 11:16:34 -0000	1.3
@@ -9,7 +9,6 @@
            p.instance_name,
            n.node_id, 
            n.name,
-           :subsite_url || n.name as url,
            (select count(*)
             from   group_approved_member_map m
             where  m.rel_type = 'membership_rel'
Index: openacs-4/packages/acs-subsite/lib/subsites.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/subsites.tcl,v
diff -u -N -r1.19 -r1.20
--- openacs-4/packages/acs-subsite/lib/subsites.tcl	10 Dec 2018 16:31:47 -0000	1.19
+++ openacs-4/packages/acs-subsite/lib/subsites.tcl	11 Dec 2018 11:16:34 -0000	1.20
@@ -3,14 +3,21 @@
 set pretty_name [_ acs-subsite.subsite]
 set pretty_plural [_ acs-subsite.subsites]
 
+set untrusted_user_id [ad_conn untrusted_user_id]
+set subsite_id [ad_conn subsite_id]
+
 set admin_p [permission::permission_p \
-                 -object_id [ad_conn subsite_id] \
+                 -object_id $subsite_id \
                  -privilege admin \
-                 -party_id [ad_conn untrusted_user_id]]
+                 -party_id $untrusted_user_id]
 
+set subsite [site_node::get_from_object_id -object_id $subsite_id]
+set subsite_node_id [dict get $subsite node_id]
+set subsite_url     [dict get $subsite url]
+
 set actions [list]
 if { $admin_p } {
-    lappend actions [_ acs-subsite.Create_new_subsite] "[subsite::get_element -element url]admin/subsite-add" {}
+    lappend actions [_ acs-subsite.Create_new_subsite] "${subsite_url}admin/subsite-add" {}
 }
 
 list::create \
@@ -44,12 +51,6 @@
         }
     }
 
-
-set subsite_node_id [subsite::get_element -element node_id]
-set subsite_url [subsite::get_element -element url]
-
-set untrusted_user_id [ad_conn untrusted_user_id]
-
 set return_url [ad_return_url]
 db_multirow -extend { url join_url request_url } subsites select_subsites {} {
     set join_url [export_vars -base "${subsite_url}register/user-join" {group_id return_url}]