changeset 384:9131b2a6a1ba

fixed not being able to change the date/time format back to Default imported from: moin--main--1.5--patch-388
author Thomas Waldmann <tw@waldmann-edv.de>
date Wed, 18 Jan 2006 08:30:34 +0000
parents 1c86e97448fa
children 795eef4b227d
files ChangeLog MoinMoin/userform.py docs/CHANGES
diffstat 3 files changed, 17 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Jan 17 08:01:41 2006 +0000
+++ b/ChangeLog	Wed Jan 18 08:30:34 2006 +0000
@@ -2,6 +2,20 @@
 # arch-tag: automatic-ChangeLog--arch@arch.thinkmo.de--2003-archives/moin--main--1.5
 #
 
+2006-01-18 09:30:34 GMT	Thomas Waldmann <tw@waldmann-edv.de>	patch-388
+
+    Summary:
+      fixed not being able to change the date/time format back to Default
+    Revision:
+      moin--main--1.5--patch-388
+
+    fixed not being able to change the date/time format back to Default
+    
+
+    modified files:
+     ChangeLog MoinMoin/userform.py docs/CHANGES
+
+
 2006-01-17 09:01:41 GMT	Thomas Waldmann <tw@waldmann-edv.de>	patch-387
 
     Summary:
--- a/MoinMoin/userform.py	Tue Jan 17 08:01:41 2006 +0000
+++ b/MoinMoin/userform.py	Wed Jan 18 08:30:34 2006 +0000
@@ -241,7 +241,7 @@
                 dt_d_combined = UserSettings._date_formats.get(form['datetime_fmt'][0], '')
                 theuser.datetime_fmt, theuser.date_fmt = dt_d_combined.split(' & ')
             except (KeyError, ValueError):
-                pass
+                theuser.datetime_fmt = '' # default
     
             # try to get the (optional) theme
             theme_name = form.get('theme_name', [self.cfg.theme_default])[0]
--- a/docs/CHANGES	Tue Jan 17 08:01:41 2006 +0000
+++ b/docs/CHANGES	Wed Jan 18 08:30:34 2006 +0000
@@ -19,6 +19,8 @@
     * we included a copy of Python 2.4.2's copy.py as some previous versions
       seem to have problems (2.3.x, x < 5 and also 2.4[.0]), see:
       http://moinmoin.wikiwikiweb.de/MoinMoinBugs/DeepCopyError
+    * Fixed the problem of not being able to change the date/time format back
+      to "Default" (UserPreferences).
 
   Other changes:
     * Updated FCKeditor to current CVS (2006-01-08 == 2.2+)