[Zope-Checkins] SVN: Zope/branches/2.12/ Merge r104627 from trunk

[Alec Mitchell]

Log message for revision 104628:
  Merge r104627 from trunk
  

Changed:
  U   Zope/branches/2.12/doc/CHANGES.rst
  U   Zope/branches/2.12/src/Products/MailHost/dtml/manageMailHost.dtml

-=-
Modified: Zope/branches/2.12/doc/CHANGES.rst
===================================================================
--- Zope/branches/2.12/doc/CHANGES.rst	2009-09-30 00:22:27 UTC (rev 104627)
+++ Zope/branches/2.12/doc/CHANGES.rst	2009-09-30 00:30:28 UTC (rev 104628)
@@ -88,7 +88,10 @@
 
 - LP #399633: fixed interpreter paths
 
+- MailHost manage form no longer interprets the value None as a string
+  in user and password fields.
 
+
 Zope 2.12.0 b3 (2009/07/15)
 ---------------------------
 

Modified: Zope/branches/2.12/src/Products/MailHost/dtml/manageMailHost.dtml
===================================================================
--- Zope/branches/2.12/src/Products/MailHost/dtml/manageMailHost.dtml	2009-09-30 00:22:27 UTC (rev 104627)
+++ Zope/branches/2.12/src/Products/MailHost/dtml/manageMailHost.dtml	2009-09-30 00:30:28 UTC (rev 104628)
@@ -56,7 +56,7 @@
     </td>
     <td align="left" valign="top">
     <input type="text" name="smtp_uid" size="15"
-     value="&dtml-smtp_uid;"/>
+     value="&dtml.null-smtp_uid;"/>
     </td>
     <td>
     <span class="form-help">(optional for SMTP AUTH)</span>
@@ -70,7 +70,7 @@
     </td>
     <td align="left" valign="top">
     <input type="password" name="smtp_pwd" size="15"
-     value="&dtml-smtp_pwd;"/>
+     value="&dtml.null-smtp_pwd;"/>
     </td>
     <td>
     <span class="form-help">(optional for SMTP AUTH)</span>