Index: openacs-4/packages/acs-lang/tcl/lang-widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-widget-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-lang/tcl/lang-widget-procs.tcl	25 Sep 2007 15:22:36 -0000	1.6
+++ openacs-4/packages/acs-lang/tcl/lang-widget-procs.tcl	11 Dec 2008 16:18:39 -0000	1.7
@@ -32,31 +32,50 @@
     }
     array set attributes $tag_attributes
 
-    append output "<select name=\"$element(name)\" id=\"$element(name)\" "
+    if { $element(mode) ne "edit" } {
+        set selected_list [list]
 
-    foreach name [array names attributes] {
-        if {$attributes($name) eq {}} {
-            append output " $name=\"$name\""
-        } else {
-            append output " $name=\"$attributes($name)\""
+        foreach option $element(options) {
+
+            set label [lindex $option 0]
+            set value [lindex $option 1]
+
+            if { [info exists values($value)] } {
+                lappend selected_list $label
+                append output "<input type=\"hidden\" name=\"$element(name)\" value=\"[ad_quotehtml $value]\">"
+            }
         }
-    }
-    append output ">\n"
 
-    foreach option $element(options) {
+        append output [join $selected_list ", "]
 
-        set label [lindex $option 0]
-        set value [lindex $option 1]
+    } else {
 
-        set value [template::util::quote_html $value]
-        append output " <option lang=\"[string range $value 0 1]\" value=\"$value\""
-        if { [info exists values($value)] } {
-            append output " selected=\"selected\""
+        append output "<select name=\"$element(name)\" id=\"$element(name)\" "
+
+        foreach name [array names attributes] {
+            if {$attributes($name) eq {}} {
+                append output " $name=\"$name\""
+            } else {
+                append output " $name=\"$attributes($name)\""
+            }
         }
+        append output ">\n"
 
-        append output ">$label</option>\n"
+        foreach option $element(options) {
+
+            set label [lindex $option 0]
+            set value [lindex $option 1]
+
+            set value [template::util::quote_html $value]
+            append output " <option lang=\"[string range $value 0 1]\" value=\"$value\""
+            if { [info exists values($value)] } {
+                append output " selected=\"selected\""
+            }
+
+            append output ">$label</option>\n"
+        }
+        append output "</select>"
     }
-    append output "</select>"
 
     return $output