Member-specific tz should obey as_tzinfo argument in default_timezone()

plone · Aug 27, 2013 · 35ddb46 · 35ddb46 · mister-roboto · Aug 27, 2013
1 parent c0f9895
commit 35ddb46
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/plone/app/event/base.py b/plone/app/event/base.py
@@ -277,7 +277,8 @@ def default_timezone(context=None, as_tzinfo=False):
         member = membership.getAuthenticatedMember()
         member_timezone = member.getProperty('timezone', None)
         if member_timezone:
-            return pytz.timezone(member_timezone).zone
+            info = pytz.timezone(member_timezone)
+            return info if as_tzinfo else info.zone
 
     portal_timezone = None
     reg = queryUtility(IRegistry, context=context, default=None)