Index: openacs-4/packages/acs-templating/tcl/richtext-or-file-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/richtext-or-file-procs.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/acs-templating/tcl/richtext-or-file-procs.tcl	6 Dec 2018 21:24:17 -0000	1.13
+++ openacs-4/packages/acs-templating/tcl/richtext-or-file-procs.tcl	3 Sep 2024 15:37:35 -0000	1.14
@@ -249,12 +249,9 @@
 } {
   upvar $element_reference element
 
-  if { [info exists element(html)] } {
-    array set attributes $element(html)
-  }
+  array set attributes \
+      [::template::widget::merge_tag_attributes element $tag_attributes]
 
-  array set attributes $tag_attributes
-
   if { [info exists element(value)] } {
       set storage_type [template::util::richtext_or_file::get_property storage_type $element(value)]
       set mime_type    [template::util::richtext_or_file::get_property mime_type $element(value)]
@@ -290,8 +287,10 @@
           }]
       }
 
+      ::template::head::add_javascript -src /resources/acs-templating/richtext-or-file.js
+
       if { $storage_type eq "" || $storage_type eq "text" } {
-          append output [subst {<script type="text/javascript" nonce='$::__csp_nonce'><!--}] \
+          append output [subst {<script type="text/javascript" nonce='[security::csp::nonce]'><!--}] \
               \n {acs_RichText_WriteButtons();  //--></script>} \
               [textarea_internal "$element(id).text" attributes $text] \
               [subst {<br>Format: \