Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v
diff -u -r1.140.2.1 -r1.140.2.2
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	17 Aug 2015 17:45:04 -0000	1.140.2.1
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	26 Aug 2015 10:03:02 -0000	1.140.2.2
@@ -761,8 +761,7 @@
 
 		if { $precedence_type ne "exclude" } {
 
-		    set flags [split [lindex $name_spec 1] ","]
-		    foreach flag $flags {
+		    foreach flag [split [lindex $name_spec 1] ","] {
 			set exp_flag($name:$flag) 1
 		    }
 		    
@@ -889,25 +888,28 @@
     if { $url_p } {
 	set export_list [list]
 	for { set i 0 } { $i < $export_size } { incr i } {
-	    lappend export_list "[ns_urlencode [ns_set key $export_set $i]]=[ns_urlencode [ns_set value $export_set $i]]"
+	    lappend export_list [ns_urlencode [ns_set key $export_set $i]]=[ns_urlencode [ns_set value $export_set $i]]
 	}
 	set export_string [join $export_list "&"]
     } else {
 	for { set i 0 } { $i < $export_size } { incr i } {
-	    append export_string "<div><input type=\"hidden\" name=\"[ad_quotehtml [ns_set key $export_set $i]]\" value=\"[ad_quotehtml "[ns_set value $export_set $i]"]\" ></div>\n"
+	    append export_string [subst {<div><input type="hidden"
+		name="[ns_quotehtml [ns_set key $export_set $i]]"
+		value="[ns_quotehtml [ns_set value $export_set $i]]"></div>
+	    }
 	}
     }
 
     if { $quotehtml_p } {
-	set export_string [ad_quotehtml $export_string]
+	set export_string [ns_quotehtml $export_string]
     }
 
     # Prepend with the base URL
     if { [info exists base] && $base ne "" } {
         if { $export_string ne "" } {
             if { [string first ? $base] > -1 } {
                 # The base already has query vars
-                set export_string "${base}&${export_string}"
+                set export_string "$base&$export_string"
             } else { 
                 # The base has no query vars
                 set export_string "$base?$export_string"
@@ -918,7 +920,7 @@
     }
     
     # Append anchor
-    if { ([info exists anchor] && $anchor ne "") } {
+    if { [info exists anchor] && $anchor ne "" } {
         append export_string "\#$anchor"
     }