changeset 626:50c7a0cc1791

fix forgotten password email
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sun, 07 May 2006 13:17:04 +0200
parents 42958bb7e500
children b8e8697ea0af
files MoinMoin/user.py MoinMoin/util/mail.py docs/CHANGES
diffstat 3 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/user.py	Sat May 06 17:59:03 2006 +0200
+++ b/MoinMoin/user.py	Sun May 07 13:17:04 2006 +0200
@@ -960,7 +960,7 @@
 
 Login Password: %s
 
-Login URL: %s/%s
+Login URL: %s/%s?action=login
 """, formatted=False) % (
                         self.name, self.enc_password, self._request.getBaseURL(), getSysPage(self._request, 'UserPreferences').page_name)
 
--- a/MoinMoin/util/mail.py	Sat May 06 17:59:03 2006 +0200
+++ b/MoinMoin/util/mail.py	Sun May 07 13:17:04 2006 +0200
@@ -75,7 +75,7 @@
     charset.header_encoding = QP
     charset.body_encoding = QP
     msg.set_charset(charset)    
-    msg.set_payload(text)
+    msg.set_payload(charset.body_encode(text))
     
     # Create message headers
     # Don't expose emails addreses of the other subscribers, instead we
--- a/docs/CHANGES	Sat May 06 17:59:03 2006 +0200
+++ b/docs/CHANGES	Sun May 07 13:17:04 2006 +0200
@@ -37,6 +37,9 @@
     * fix MonthCalendar macro for non-ASCII pagenames (thanks to Jonas Smedegaard)
     * remove 'search' and 'google' from bot user agent list and add some more
       specific terms
+    * Fix the forgotten password email login URL and also properly encode the
+      email body. Thanks to Robin Dunn for the patch.
+
 
 Version 1.5.3:
   New Features: