From c2b56ba6f9e26d66a871b0dec8ffb4a3668a13ce Mon Sep 17 00:00:00 2001 From: Andre D Date: Mon, 1 Oct 2012 12:04:28 -0500 Subject: [PATCH] wiki: Handle wiki_edit_age or wiki_edit_karma being None. --- r2/r2/controllers/validator/wiki.py | 4 ++-- r2/r2/models/subreddit.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/r2/r2/controllers/validator/wiki.py b/r2/r2/controllers/validator/wiki.py index de63a86aa..a9c3cd17f 100644 --- a/r2/r2/controllers/validator/wiki.py +++ b/r2/r2/controllers/validator/wiki.py @@ -117,12 +117,12 @@ def may_revise(sr, user, page=None): return True karma = max(user.karma('link', sr), user.karma('comment', sr)) - if karma < sr.wiki_edit_karma: + if karma < (sr.wiki_edit_karma or 0): # If the user has too few karma, they should not contribute return False age = (datetime.datetime.now(g.tz) - user._date).days - if age < sr.wiki_edit_age: + if age < (sr.wiki_edit_age or 0): # If they user's account is too young # They should not contribute return False diff --git a/r2/r2/models/subreddit.py b/r2/r2/models/subreddit.py index d5fc10d58..cb6180d74 100644 --- a/r2/r2/models/subreddit.py +++ b/r2/r2/models/subreddit.py @@ -102,7 +102,8 @@ class Subreddit(Thing, Printable): allow_comment_gilding=True, ) _essentials = ('type', 'name', 'lang') - _data_int_props = Thing._data_int_props + ('mod_actions', 'reported') + _data_int_props = Thing._data_int_props + ('mod_actions', 'reported', + 'wiki_edit_karma', 'wiki_edit_age') sr_limit = 50 gold_limit = 100