Index: openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl,v
diff -u -N -r1.43 -r1.44
--- openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl	27 Nov 2009 09:33:45 -0000	1.43
+++ openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl	11 Dec 2009 11:28:27 -0000	1.44
@@ -406,15 +406,15 @@
       if {[regexp {^#(.*)#$} $label _ message_key]} {
         set label [_ $message_key]
       }
-      set value [string map {\" \\\"} $label]
+      set value [string map {\" \\\" \n \r)} $label]
       lappend line \"$value\"
     }
     append output [join $line ,] \n
     foreach row [my children] {
       set line [list]
       foreach column [[self]::__columns children] {
         if {[$column exists no_csv]} continue
-	set value [string map {\" \\\"} [$row set [$column set name]]]
+	set value [string map {\" \\\" \n \r} [$row set [$column set name]]]
 	lappend line \"$value\"
       }
       append output [join $line ,] \n