--- a/CHANGES.txt	Sat Jun 15 15:49:29 2002 +0000
+++ b/CHANGES.txt	Sun Jun 16 01:01:42 2002 +0000
@@ -40,6 +40,7 @@
    - also changed cgi client since it was duplicating the functionality
 
 Fixed:
+ . remove CR characters embedded in messages (ZRoundup)
  . properly quote the email address and "real name" in all situations using the
     'email' module if it is available and 'rfc822' otherwise
  . #565992 ] if ISSUE_TRACKER_WEB doesn't have the trailing '/', add it

--- a/frontends/ZRoundup/ZRoundup.py	Sat Jun 15 15:49:29 2002 +0000
+++ b/frontends/ZRoundup/ZRoundup.py	Sun Jun 16 01:01:42 2002 +0000
@@ -14,7 +14,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: ZRoundup.py,v 1.7 2002-06-14 01:25:46 dman13 Exp $
+# $Id: ZRoundup.py,v 1.8 2002-06-16 01:01:42 dman13 Exp $
 #
 ''' ZRoundup module - exposes the roundup web interface to Zope
 
@@ -146,7 +146,13 @@
             # with it and we lose all the :filter, :columns, etc goodness
             form = None
         else:
-            form = FormWrapper(self.REQUEST.form)
+            # For some reason, CRs are embeded in multiline notes.
+            # It doesn't occur with apache/roundup.cgi, though.
+            form = self.REQUEST.form 
+            if form.has_key( '__note' ) :
+                form['__note'] = form['__note'].replace( '\r' , '' )
+            form = FormWrapper(form)
+
         return instance.Client(instance, request, env, form)
 
 
@@ -201,6 +207,9 @@
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.7  2002/06/14 01:25:46  dman13
+# Fixed bug #558867 by redirecting /instance requests to /instance/
+#
 # Revision 1.6  2002/06/12 00:59:44  dman13
 # Fixed the logic for determing the cookie path.  (Closes #562130.)
 #