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.48 -r1.49
--- openacs-4/packages/acs-templating/tcl/widget-procs.tcl	18 Sep 2007 03:49:05 -0000	1.48
+++ openacs-4/packages/acs-templating/tcl/widget-procs.tcl	2 Oct 2007 19:03:37 -0000	1.49
@@ -378,7 +378,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 { [string equal $type "password"] || [string equal $type "text"] || [string equal $type "button"] || [string equal $type "file"]} { 
+    } elseif { $type eq "password" || $type eq "text" || $type eq "button" || $type eq "file"} { 
 	set attributes(id) "$element(name)" 
     }
 
@@ -905,7 +905,7 @@
 	    foreach answer_desc $option {
 		set answer_description [lindex $answer_desc 0]
 		set no_of_answers [lindex $answer_desc 1]
-		append output "<th colspan=\"[expr $no_of_answers + 1]\" align=\"center\">$answer_description</th>"
+		append output "<th colspan=\"[expr {$no_of_answers + 1}]\" align=\"center\">$answer_description</th>"
 	    }
 	    append output "</tr>"
 	} elseif {$count == 1} {