Index: openacs-4/packages/acs-templating/tcl/widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/widget-procs.tcl,v
diff -u -r1.63.2.22 -r1.63.2.23
--- openacs-4/packages/acs-templating/tcl/widget-procs.tcl	30 Nov 2023 14:13:35 -0000	1.63.2.22
+++ openacs-4/packages/acs-templating/tcl/widget-procs.tcl	30 Nov 2023 14:14:54 -0000	1.63.2.23
@@ -277,11 +277,8 @@
     upvar $element_reference element
 
     if { [info exists element(html)] } {
-        foreach {key value} $element(html) {
-            dict lappend tag_attributes $key {*}$value
-        }
+        array set attributes $element(html)
     }
-
     array set attributes $tag_attributes
 
     if { [info exists element(value)] } {
@@ -388,9 +385,7 @@
     upvar $element_reference element
 
     if { [info exists element(html)] } {
-        foreach {key value} $element(html) {
-            dict lappend tag_attributes $key {*}$value
-        }
+        array set attributes $element(html)
     }
 
     array set attributes $tag_attributes
@@ -577,10 +572,9 @@
 
     # always ignore value for submit widget
     set element(value) $element(label)
-
-    dict lappend tag_attributes class prevent-double-click
-
-    return [input submit element $tag_attributes]
+    
+    return [input submit element \
+                [dict lappend tag_attributes class prevent-double-click]]
 }
 
 ad_proc -public template::widget::attachment {
@@ -765,9 +759,7 @@
     upvar $element_reference element
 
     if { [info exists element(html)] } {
-        foreach {key value} $element(html) {
-            dict lappend tag_attributes $key {*}$value
-        }
+        array set attributes $element(html)
     }
 
     array set attributes $tag_attributes
@@ -791,9 +783,7 @@
     upvar $element_reference element
 
     if { [info exists element(html)] } {
-        foreach {key value} $element(html) {
-            dict lappend tag_attributes $key {*}$value
-        }
+        array set attributes $element(html)
     }
 
     array set attributes $tag_attributes
@@ -907,9 +897,7 @@
     upvar $element_reference element
 
     if { [info exists element(html)] } {
-        foreach {key value} $element(html) {
-            dict lappend tag_attributes $key {*}$value
-        }
+        array set attributes $element(html)
     }
 
     array set attributes $tag_attributes
@@ -951,9 +939,7 @@
     upvar $element_reference element
 
     if { [info exists element(html)] } {
-        foreach {key value} $element(html) {
-            dict lappend tag_attributes $key {*}$value
-        }
+        array set attributes $element(html)
     }
 
     if { [info exists element(value)] } {
@@ -1089,11 +1075,8 @@
 } {
 
     upvar $element_reference element
-
     if { [info exists element(html)] } {
-        foreach {key value} $element(html) {
-            dict lappend tag_attributes $key {*}$value
-        }
+        array set attributes $element(html)
     }
 
     array set attributes $tag_attributes
@@ -1205,11 +1188,8 @@
     @error
 } {
     upvar $element_reference element
-
     if { [info exists element(html)] } {
-        foreach {key value} $element(html) {
-            dict lappend tag_attributes $key {*}$value
-        }
+        array set attributes $element(html)
     }
 
     array set attributes $tag_attributes
@@ -1334,11 +1314,8 @@
     @error
 } {
     upvar $element_reference element
-
     if { [info exists element(html)] } {
-        foreach {key value} $element(html) {
-            dict lappend tag_attributes $key {*}$value
-        }
+        array set attributes $element(html)
     }
 
     array set attributes $tag_attributes