github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-02-15 17:05:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

If a user is loggedin, and does not have over18 pref, do not show over18 content.

Browse Source 
Previously, the existence of an over18 cookie would display over18 content to
loggedin users, even if their preferences disallowed over18 content.
This commit is contained in:
Jason Harvey
2013-05-10 12:01:02 -07:00
committed by Max Goodman
parent 7ecceb9169
commit 1b5d22089c
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
r2/r2/controllers/reddit_base.py
View File

@@ -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