github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-27 15:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

wiki: Fix deleted account leak.

Browse Source
This commit is contained in:
Andre D
2012-12-06 11:46:56 -05:00
committed by Neil Williams
parent d20ec78d4e
commit 7850a4b25a
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
r2/r2/lib/jsontemplates.py
View File

@@ -600,7 +600,9 @@ class WikiViewJsonTemplate(ThingJsonTemplate):
def data(self, thing):
edit_date = time.mktime(thing.edit_date.timetuple()) if thing.edit_date else None
edit_by = Wrapped(thing.edit_by).render() if thing.edit_by else None
edit_by = None
if thing.edit_by and not thing.edit_by._deleted:
edit_by = Wrapped(thing.edit_by).render()
return dict(content_md=thing.page_content_md,
content_html=wikimarkdown(thing.page_content_md),
revision_by=edit_by,
@@ -620,7 +622,10 @@ class WikiRevisionJsonTemplate(ThingJsonTemplate):
def render(self, thing, *a, **kw):
timestamp = time.mktime(thing.date.timetuple()) if thing.date else None
author = thing.get_author()
author = Wrapped(author).render() if author else None
if author and not author._deleted:
author = Wrapped(author).render()
else:
author = None
return ObjectTemplate(dict(author=author,
id=str(thing._id),
timestamp=timestamp,