# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1432690831 18000
# Node ID e56455f4626b449a35aa8ab9352db3119e73e597
# Parent  0a2f23d5bec4586d2aeff2b9ec9209672ac7f339# Parent  8647a669edb443a2a8a12c8dfd5dba86809a7758
Merge with upstream.

diff -r 0a2f23d5bec4 -r e56455f4626b forums/templatetags/forum_tags.py
--- a/forums/templatetags/forum_tags.py	Tue May 19 19:31:45 2015 -0500
+++ b/forums/templatetags/forum_tags.py	Tue May 26 20:40:31 2015 -0500
@@ -61,18 +61,9 @@
     """
     Return the supplied user's time preferences in the form of a 2-tuple:
         (use_24_time, time_zone_name)
-
-    These preferences are cached to reduce database hits.
-
     """
-    cache_key = '%s_tz_prefs' % user.username
-    tz_prefs = cache.get(cache_key)
-    if tz_prefs is None:
-        profile = user.profile
-        tz_prefs = profile.use_24_time, profile.time_zone
-        cache.set(cache_key, tz_prefs)
-
-    return tz_prefs
+    profile = user.profile
+    return profile.use_24_time, profile.time_zone
 
 
 @register.simple_tag