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.59 -r1.60
--- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	11 Jan 2004 16:33:46 -0000	1.59
+++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	14 Jan 2004 15:06:05 -0000	1.60
@@ -1177,21 +1177,40 @@
         # own caching, so calling it instead of [ns_conn form]
         # is OK.
 
-        if { $var == "form" } {
-            return [ns_getform] 
-        }
-        if { $var == "all" } {
-            return [array get ad_conn]
-        }
+        switch $var {
+            form {
+                return [ns_getform] 
+            }
+            all {
+                return [array get ad_conn]
+            }
+            default {
+                if { [info exists ad_conn($var)] } {
+                    return $ad_conn($var)
+                }
 
-
-        if { [info exists ad_conn($var)] } {
-            return $ad_conn($var)
-        } else {
-            if { [string equal $var "locale"] } { 
-                return [parameter::get -parameter SiteWideLocale -package_id [apm_package_id_from_key "acs-lang"] -default {en_US}]
+                # Fallback 
+                switch $var {
+                    locale {
+                        set ad_conn(locale) [parameter::get \
+                                                 -parameter SiteWideLocale \
+                                                 -package_id [apm_package_id_from_key "acs-lang"] \
+                                                 -default {en_US}]
+                        return $ad_conn(locale)
+                    }
+                    subsite_id {
+                        set ad_conn(subsite_id) [site_node::closest_ancestor_package \
+                                                     -node_id [ad_conn node_id] \
+                                                     -package_key "acs-subsite" \
+                                                     -include_self \
+                                                     -element "package_id"]
+                        return $ad_conn(subsite_id)
+                    }
+                    default {
+                        return [ns_conn $var]
+                    }
+                }
             }
-            return [ns_conn $var]
         }
     }
 
Index: openacs-4/packages/acs-templating/tcl/acs-integration-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/acs-integration-procs.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/acs-templating/tcl/acs-integration-procs.tcl	22 Oct 2003 16:26:55 -0000	1.13
+++ openacs-4/packages/acs-templating/tcl/acs-integration-procs.tcl	14 Jan 2004 15:06:34 -0000	1.14
@@ -97,8 +97,6 @@
 } {
     namespace eval template variable parse_level ""
     #ns_log debug "adp_parse_ad_conn_file => file '[file root [ad_conn file]]'"
-    # Pull out the package_id of the subsite closest to our current node
-    ad_conn -set subsite_id [site_node_closest_ancestor_package "acs-subsite"]
 
     set parsed_template [template::adp_parse [file root [ad_conn file]] {}]