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 -N -r1.153.2.7 -r1.153.2.8
--- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	20 May 2019 20:26:45 -0000	1.153.2.7
+++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	31 Jul 2019 09:19:23 -0000	1.153.2.8
@@ -1537,7 +1537,8 @@
                                                      -default {en_US}]
                             return $ad_conn(locale)
                         }
-                        node_id {
+                        node_id -
+                        package_id {
                             # This is just a fallback, when the request
                             # processor has failed to set the actual site
                             # node, e.g. on invalid requests. When the
@@ -1549,20 +1550,11 @@
                             # determine the appropriate template without
                             # the node_id. In case of failure, the
                             # toplevel node_is is returned.
-                            array set node [site_node::get -url /]
-                            set ad_conn($var) $node(node_id)
+                            set node [site_node::get -url /]
+                            set ad_conn($var) [dict get $node $var]
                             ns_log notice "ad_conn: request processor did not set <ad_conn $var>, fallback: $ad_conn($var)"
                             return $ad_conn($var)
                         }
-                        package_id {
-                            # This is just a fallback, when the request
-                            # processor has failed to set the actual
-                            # package_id (see as wee under node_id above).
-                            array set node [site_node::get -url /]
-                            set ad_conn($var) $node(package_id)
-                            ns_log notice "ad_conn: request processor did not set <ad_conn $var>, fallback: $ad_conn($var)"
-                            return $ad_conn($var)
-                        }
                         untrusted_user_id -
                         session_id -
                         user_id {