Permalink
Browse files

Merge pull request #50 from duilio/master

Make Comment._get_userinfo properly reentrant.
  • Loading branch information...
2 parents 2e729c6 + 6524ef5 commit 1b05546bd50d1bf99e3d0e7def1238edf8d44065 @alex alex committed May 8, 2012
Showing with 5 additions and 4 deletions.
  1. +5 −4 django/contrib/comments/models.py
@@ -92,23 +92,24 @@ def _get_userinfo(self):
This dict will have ``name``, ``email``, and ``url`` fields.
"""
if not hasattr(self, "_userinfo"):
- self._userinfo = {
+ userinfo = {
"name" : self.user_name,
"email" : self.user_email,
"url" : self.user_url
}
if self.user_id:
u = self.user
if u.email:
- self._userinfo["email"] = u.email
+ userinfo["email"] = u.email
# If the user has a full name, use that for the user name.
# However, a given user_name overrides the raw user.username,
# so only use that if this comment has no associated name.
if u.get_full_name():
- self._userinfo["name"] = self.user.get_full_name()
+ userinfo["name"] = self.user.get_full_name()
elif not self.user_name:
- self._userinfo["name"] = u.username
+ userinfo["name"] = u.username
+ self._userinfo = userinfo
return self._userinfo
userinfo = property(_get_userinfo, doc=_get_userinfo.__doc__)

0 comments on commit 1b05546

Please sign in to comment.