github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-04-27 03:00:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Clear cookies for all error handling"

Browse Source 
This reverts commit 48756719bc.
This commit is contained in:
Florence Yeun
2015-08-24 09:54:53 -07:00
parent abbb082a59
commit 945a7df2e7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
r2/r2/controllers/error.py
View File

@@ -115,8 +115,6 @@ class ErrorController(RedditController):
try:
c.error_page = True
RedditController.__before__(self)
# clear cookies the old fashioned way
c.cookies = Cookies()
except (HTTPMovedPermanently, HTTPFound):
# ignore an attempt to redirect from an error page
pass
@@ -204,6 +202,8 @@ class ErrorController(RedditController):
def GET_document(self):
try:
c.errors = c.errors or ErrorSet()
# clear cookies the old fashioned way
c.cookies = Cookies()
code = request.GET.get('code', '')
try: