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

Don't die if votes are missing some information.

Browse Source
This commit is contained in:
Neil Williams
2011-06-07 21:21:34 -07:00
committed by Max Goodman
parent 12db75ee85
commit 06913a25a7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
r2/r2/models/vote.py
View File

@@ -175,7 +175,7 @@ class Vote(MultiRelation('vote',
old_valid_thing = getattr(v, 'valid_thing', False)
v.valid_thing = (valid_thing(v, karma, cheater = cheater)
and getattr(v,'valid_thing', False))
v.valid_user = (v.valid_user
v.valid_user = (getattr(v, 'valid_user', False)
and v.valid_thing
and valid_user(v, sr, karma))
#new vote
@@ -222,7 +222,8 @@ class Vote(MultiRelation('vote',
cv = cvc(thing1_id = voter._id36, thing2_id = votee._id36)
cv.name = v._name
cv.valid_user, cv.valid_thing = v.valid_user, v.valid_thing
cv.ip = v.ip
if hasattr(v, 'ip'):
cv.ip = v.ip
if getattr(v, 'organic', False) or hasattr(cv, 'organic'):
cv.organic = getattr(v, 'organic', False)
cv._commit()