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.52.2.1 -r1.52.2.2 --- openacs-4/packages/acs-templating/tcl/widget-procs.tcl 8 Sep 2015 16:26:43 -0000 1.52.2.1 +++ openacs-4/packages/acs-templating/tcl/widget-procs.tcl 10 Sep 2015 07:00:05 -0000 1.52.2.2 @@ -322,7 +322,7 @@ if { $mode ne "edit" } { set output {} if { $value ne "" } { - append output "[ad_quotehtml $value]" + append output "[ns_quotehtml $value]" } } else { set output "" + append output ">[ns_quotehtml $value]" } return $output @@ -381,7 +381,7 @@ if { ( $type eq "checkbox" || $type eq "radio" ) && [info exists element(value)] } { # This can be used in the form template in a tag. set attributes(id) "$element(form_id):elements:$element(name):$element(value)" - } elseif { $type eq "password" || $type eq "text" || $type eq "button" || $type eq "file"} { + } elseif { $type in {"password" "text" "button" "file" }} { set attributes(id) "$element(name)" } @@ -390,18 +390,19 @@ if { $element(mode) ne "edit" && $type ni { hidden submit button clear checkbox radio } } { set output "" if { [info exists element(value)] } { - append output [ad_quotehtml $element(value)] - append output "" + append output [ns_quotehtml $element(value)] + append output "" } } else { set output " + }] incr count } @@ -661,7 +662,7 @@ if { [info exists values($value)] } { lappend selected_list $label - append output "" + append output "" } } @@ -678,7 +679,7 @@ set label [lindex $option 0] set value [lindex $option 1] - append output " " - append output "" + append output "" + append output "" } } @@ -1328,3 +1329,11 @@ return $output } + +# +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: +