From 1b5d22089c66368c3bebe533e197f29878363ed6 Mon Sep 17 00:00:00 2001 From: Jason Harvey Date: Fri, 10 May 2013 12:01:02 -0700 Subject: [PATCH] If a user is loggedin, and does not have over18 pref, do not show over18 content. Previously, the existence of an over18 cookie would display over18 content to loggedin users, even if their preferences disallowed over18 content. --- r2/r2/controllers/reddit_base.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/r2/r2/controllers/reddit_base.py b/r2/r2/controllers/reddit_base.py index 50001dfea..21383016b 100644 --- a/r2/r2/controllers/reddit_base.py +++ b/r2/r2/controllers/reddit_base.py @@ -313,9 +313,8 @@ def delete_obsolete_cookies(): c.cookies[cookie_name] = Cookie("", expires=DELETE) def over18(): - if c.user.pref_over_18 or c.user_is_admin: - return True - + if c.user_is_loggedin: + return c.user.pref_over_18 or c.user_is_admin else: if 'over18' in c.cookies: cookie = c.cookies['over18'].value