Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v
diff -u -N -r1.215 -r1.216
--- openacs-4/packages/new-portal/tcl/portal-procs.tcl	19 Dec 2018 12:39:48 -0000	1.215
+++ openacs-4/packages/new-portal/tcl/portal-procs.tcl	19 Dec 2018 18:40:31 -0000	1.216
@@ -2283,24 +2283,13 @@
         set template_src $package_key
     }
 
-    # some stupid upvar tricks to get them set right
-    upvar __ts ts
-    set ts $template_src
-
-    upvar __pk pk
-    set pk $package_key
-
-    upvar __cflist cflist
-    set cflist $config_list
-
     ns_log Debug "portal::show_proc_helper - package_key=$package_key, template=$template_src"
 
-    uplevel 1 {
-        set template [subst {<include src="/packages/$__pk/www/$__ts" cf="$__cflist">}]
-        set __adp_stub [acs_root_dir]
-        set code [template::adp_compile -string $template]
-        return [template::adp_eval code]
-    }
+    set template [subst {<include src="/packages/$package_key/www/$template_src" cf="$config_list">}]
+    set __adp_stub [acs_root_dir]
+    set code [template::adp_compile -string $template]
+    
+    return [template::adp_eval code]
 }
 
 ad_proc -public portal::get_theme_id {