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]<input type=\"hidden\" name=\"$name\" value=\"[ad_quotehtml $value]\">"
+            append output "[ns_quotehtml $value]<input type=\"hidden\" name=\"$name\" value=\"[ns_quotehtml $value]\">"
         }
     } else {
         set output "<textarea name=\"$name\""
@@ -335,7 +335,7 @@
             }
         }
         
-        append output ">[ad_quotehtml $value]</textarea>"
+        append output ">[ns_quotehtml $value]</textarea>"
     }
     
     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 <label for="id">...</label> 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 "<input type=\"hidden\" name=\"$element(name)\" value=\"[ad_quotehtml $element(value)]\">"
+            append output [ns_quotehtml $element(value)]
+            append output "<input type=\"hidden\" name=\"$element(name)\" value=\"[ns_quotehtml $element(value)]\">"
         }
     } else {
         set output "<input type=\"$type\" name=\"$element(name)\""
 
         if { $element(mode) ne "edit" && $type ni { hidden submit button clear } } {
             append output " disabled"
-		}
+        }
 
+
         if { [info exists element(value)] } {
-            append output " value=\"[ad_quotehtml $element(value)]\""
+            append output " value=\"[ns_quotehtml $element(value)]\""
         } 
 
         foreach name [array names attributes] {
@@ -510,7 +511,7 @@
       set count 0
       foreach itemvalue $element(values) {
 	append output [subst {
-	  <input type="hidden" id="$element(form_id):$element(name):$count" name="$element(name)" value="[ad_quotehtml $itemvalue]">
+	  <input type="hidden" id="$element(form_id):$element(name):$count" name="$element(name)" value="[ns_quotehtml $itemvalue]">
 	}]
         incr count
       }
@@ -661,7 +662,7 @@
 
             if { [info exists values($value)] } {
                 lappend selected_list $label
-                append output "<input type=\"hidden\" name=\"$widget_name\" value=\"[ad_quotehtml $value]\">"
+                append output "<input type=\"hidden\" name=\"$widget_name\" value=\"[ns_quotehtml $value]\">"
             }
         }
 
@@ -678,7 +679,7 @@
                     set label [lindex $option 0]
                     set value [lindex $option 1]
 
-                    append output " <input type=\"$widget_type\" name=\"$widget_name\" value=\"[ad_quotehtml $value]\""
+                    append output " <input type=\"$widget_type\" name=\"$widget_name\" value=\"[ns_quotehtml $value]\""
                     if { [info exists values($value)] } {
                         append output " checked=\"checked\""
                     }
@@ -703,7 +704,7 @@
                     set label [lindex $option 0]
                     set value [lindex $option 1]
 
-                    append output " <option value=\"[ad_quotehtml $value]\""
+                    append output " <option value=\"[ns_quotehtml $value]\""
                     if { [info exists values($value)] } {
                         append output " selected=\"selected\""
                     }
@@ -1074,8 +1075,8 @@
 	    append output [template::util::select_text::get_property select_value $element(value)]
 	    append output "&nbsp;"
 	    append output [template::util::select_text::get_property text_value $element(value)]          
-	    append output "<input type=\"hidden\" name=\"$element(id).text\" value=\"[ad_quotehtml $text]\">"
-	    append output "<input type=\"hidden\" name=\"$element(id)\" value=\"[ad_quotehtml $select]\">"
+	    append output "<input type=\"hidden\" name=\"$element(id).text\" value=\"[ns_quotehtml $text]\">"
+	    append output "<input type=\"hidden\" name=\"$element(id)\" value=\"[ns_quotehtml $select]\">"
 	}
     }
     
@@ -1328,3 +1329,11 @@
     
     return $output
 }
+
+#
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End:
+