Index: openacs-4/packages/acs-admin/www/subsites.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/subsites.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/subsites.tcl	15 Jun 2018 21:49:44 -0000	1.3
+++ openacs-4/packages/acs-admin/www/subsites.tcl	26 Jun 2018 09:28:01 -0000	1.4
@@ -18,33 +18,20 @@
 } else {
     set too_many_subsites_p 0
 
-    db_multirow -extend {
-        theme
-        theme_url
-        admin_url
-        path_pretty
-        parameter_url
-        node_url
-    } subsites subsite_admin_urls [subst {
-        select s.node_id,
-               p.package_id
-        from   site_nodes s, apm_packages p
-        where  s.object_id = p.package_id
-        and    p.package_key in ($package_keys)        
-    }] {
+    db_multirow -extend { theme theme_url admin_url path_pretty parameter_url} subsites subsite_admin_urls {} {
         set admin_url "${node_url}admin/"
         set parameter_url [export_vars -base /shared/parameters {package_id {return_url "[ad_conn url]"}}]
-        set node [site_node::get -node_id $node_id]
-        set path_pretty [dict get $node instance_name]
-        set parent_id   [dict get $node parent_id]
-        set node_url    [dict get $node url]
+        set path_pretty $instance_name
+        array set node [site_node::get -node_id $node_id]
+        set parent_id $node(parent_id)
         set theme [parameter::get -parameter ThemeKey -package_id $package_id]
         set theme_url ${admin_url}themes/
         
         while { $parent_id ne "" } {
-            set node [site_node::get -node_id $parent_id]
-            set path_pretty "[dict get $node instance_name] > $path_pretty"
-            set parent_id [dict get $node parent_id]
+            array unset node
+            array set node [site_node::get -node_id $parent_id]
+            set path_pretty "$node(instance_name) > $path_pretty"
+            set parent_id $node(parent_id)
         }
     }
     multirow sort subsites path_pretty
@@ -64,6 +51,7 @@
                 display_template {\#acs-admin.Pages#}
                 html {align left}
             }
+
             theme {
                 label "Theme"
                 link_url_col theme_url