From f79949ae60941a1894eabff0f234469f7df08ad5 Mon Sep 17 00:00:00 2001 From: Brian Simpson Date: Wed, 13 Nov 2013 19:18:14 -0500 Subject: [PATCH] Don't link subreddit creator if they're not a moderator. --- r2/r2/lib/pages/pages.py | 9 +++++++++ r2/r2/templates/subredditinfobar.html | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py index d879fef87..3ebfff551 100644 --- a/r2/r2/lib/pages/pages.py +++ b/r2/r2/lib/pages/pages.py @@ -804,6 +804,15 @@ class SubredditInfoBar(CachedTemplate): CachedTemplate.__init__(self) + @property + def creator_text(self): + if self.sr.author: + if self.sr.is_moderator(self.sr.author) or self.sr.author._deleted: + return WrappedUser(self.sr.author).render() + else: + return self.sr.author.name + return None + def nav(self): buttons = [NavButton(plurals.moderators, 'moderators')] if self.type != 'public': diff --git a/r2/r2/templates/subredditinfobar.html b/r2/r2/templates/subredditinfobar.html index 6cff99275..d8d05dbeb 100644 --- a/r2/r2/templates/subredditinfobar.html +++ b/r2/r2/templates/subredditinfobar.html @@ -71,7 +71,7 @@
%if thing.sr.author: - ${unsafe(_("created by %(user)s") % dict(user = unsafe(WrappedUser(thing.sr.author).render())))} + ${unsafe(_("created by %(user)s") % dict(user = unsafe(thing.creator_text)))} %endif