Index: openacs-4/packages/diagram/diagram.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/diagram/diagram.info,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/diagram/diagram.info	10 Jan 2006 07:34:17 -0000	1.1
+++ openacs-4/packages/diagram/diagram.info	18 Apr 2022 08:47:17 -0000	1.2
@@ -7,16 +7,17 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="0.2b" url="http://openacs.org/repository/download/apm/diagram-0.2b.apm">
+    <version name="0.2b2" url="http://openacs.org/repository/download/apm/diagram-0.2b2.apm">
         <owner url="mailto:mazloumi@uni-mannheim.de">Nima Mazloumi</owner>
         <summary>Extension to acs-templating package to give support for diagrams.</summary>
         <release-date>2005-11-25</release-date>
         <vendor url="http//www.uni-mannheim.de">Universität Mannheim</vendor>
         <description format="text/html">This package gives support to multirow based diagrams. Like template::list::create you can easily define your diagram and pass the multirow to be used. Currently it has only support for Javascript based diagrams. The underlying library used is JavaScript Diagram Builder v3.3 from Lutz Tautenhahn. The rendering is encapsulated though. This allows future version to give support for different engines like GNUPlot.</description>
         <maturity>0</maturity>
 
-        <provides url="diagram" version="0.2b"/>
+        <provides url="diagram" version="0.2b2"/>
         <requires url="acs-lang" version="5.2.0a1"/>
+        <requires url="acs-templating" version="5.10.1d8"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/diagram/tcl/diagram-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/diagram/tcl/diagram-procs.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/diagram/tcl/diagram-procs.tcl	9 May 2018 15:33:30 -0000	1.5
+++ openacs-4/packages/diagram/tcl/diagram-procs.tcl	18 Apr 2022 08:47:17 -0000	1.6
@@ -529,16 +529,9 @@
     }
     set file_stub "[acs_root_dir]/packages/diagram/resources/diagram/$template"
 
-    # ensure that the template template has been compiled and is up-to-date
-    template::adp_init adp $file_stub
+    # ensure that the template template has been compiled and is up-to-date, and call it.
+    [template::adp_init adp $file_stub]
 
-    # get result of template output procedure into __adp_output
-    # the only data source on which this template depends is the "elements"
-    # multirow data source.  The output of this procedure will be
-    # placed in __adp_output in this stack frame.
-   
-    template::code::adp::$file_stub
-
     return $__adp_output
 }
 
Index: openacs-4/packages/workflow/workflow.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/workflow.info,v
diff -u -N -r1.22 -r1.23
--- openacs-4/packages/workflow/workflow.info	26 Jul 2017 07:40:31 -0000	1.22
+++ openacs-4/packages/workflow/workflow.info	18 Apr 2022 08:52:27 -0000	1.23
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>workflow</auto-mount>
 
-    <version name="2.1.2d1" url="http://openacs.org/repository/download/apm/workflow-2.1.2d1.apm">
+    <version name="2.1.2d2" url="http://openacs.org/repository/download/apm/workflow-2.1.2d2.apm">
         <owner url="http://pinds.com">Lars Pind</owner>
         <owner url="http://petermarklund.com">Peter Marklund</owner>
         <summary>A Tcl API for creating and managing workflows.</summary>
@@ -26,10 +26,11 @@
 For more information, see: &lt;a href=&quot;http://web.archive.org/web/20050224212933/http://www.collaboraid.biz/developer/workflow-spec&quot;&gt;the workflow specification&lt;/a&gt;.</description>
         <maturity>0</maturity>
 
-        <provides url="workflow" version="2.1.2d1"/>
+        <provides url="workflow" version="2.1.2d2"/>
         <requires url="acs-content-repository" version="5.0.0b4"/>
         <requires url="acs-kernel" version="5.2.0d2"/>
         <requires url="notifications" version="5.1.7"/>
+        <requires url="acs-templating" version="5.10.1d8"/>
 
         <callbacks>
             <callback type="after-install"  proc="workflow::install::package_install"/>
Index: openacs-4/packages/workflow/tcl/case-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/workflow/tcl/case-procs.tcl,v
diff -u -N -r1.55 -r1.56
--- openacs-4/packages/workflow/tcl/case-procs.tcl	20 Nov 2019 14:06:41 -0000	1.55
+++ openacs-4/packages/workflow/tcl/case-procs.tcl	18 Apr 2022 08:52:27 -0000	1.56
@@ -486,7 +486,7 @@
     }
     
     # ensure that the style template has been compiled and is up-to-date
-    template::adp_init adp $file_stub
+    set stub_call [template::adp_init adp $file_stub]
 
     set activity_entry_list [get_activity_log_info_not_cached -case_id $case_id]
     set start_index 0
@@ -513,12 +513,15 @@
 	}
 
         # The output of this procedure will be placed in __adp_output in this stack frame.
-        template::code::adp::$file_stub
+        $stub_call
         append log_html $__adp_output
     }
 
     if { $action_id ne "" } {
-        set action_pretty_past_tense [lang::util::localize [workflow::action::get_element -action_id $action_id -element pretty_past_tense]]
+        set action_pretty_past_tense [lang::util::localize \
+                                          [workflow::action::get_element \
+                                               -action_id $action_id \
+                                               -element pretty_past_tense]]
 
         # sets first_names, last_name, email
         acs_user::get -user_id [ad_conn untrusted_user_id] -array user