merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -11,6 +11,7 @@ Fixed:
 - fix messageid generated when msgid is None for send_message (sf bug 987933)
 - make user permissions check more sane (fix search page for anonymous)
 - fixed RDBMS filter() for no matches from full-text search (sf bug 990778)
+- fixed DateHTMLProperty for invalid date entry (sf bug 986538)
 
 
 2004-06-24 0.7.5

roundup/cgi/templating.py

@@ -1301,7 +1301,7 @@ def now(self):
         return DateHTMLProperty(self._client, self._classname, self._nodeid,
             self._prop, self._formname, date.Date('.'))
 
-    def field(self, size = 30):
+    def field(self, size=30):
         ''' Render a form edit field for the property
 
             If not editable, just display the value via plain().
@@ -1310,6 +1310,8 @@ def field(self, size = 30):
 
         if self._value is None:
             value = ''
+        elif type(self._value) is type(''):
+            value = self._value
         else:
             tz = self._db.getUserTimezone()
             value = cgi.escape(str(self._value.local(tz)))