innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Merge pull request #50 from duilio/master 

Make Comment._get_userinfo properly reentrant.
This commit is contained in:
Alex Gaynor 2012-05-08 08:37:51 -07:00
parent 2e729c6c33 6524ef501d
commit 1b05546bd5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
django/contrib/comments/models.py
View File

@ -92,7 +92,7 @@ class Comment(BaseCommentAbstractModel):
This dict will have ``name``, ``email``, and ``url`` fields. This dict will have ``name``, ``email``, and ``url`` fields.
""" """
if not hasattr(self, "_userinfo"): if not hasattr(self, "_userinfo"):
self._userinfo = { userinfo = {
"name" : self.user_name, "name" : self.user_name,
"email" : self.user_email, "email" : self.user_email,
"url" : self.user_url "url" : self.user_url
@ -100,15 +100,16 @@ class Comment(BaseCommentAbstractModel):
if self.user_id: if self.user_id:
u = self.user u = self.user
if u.email: 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. # If the user has a full name, use that for the user name.
# However, a given user_name overrides the raw user.username, # However, a given user_name overrides the raw user.username,
# so only use that if this comment has no associated name. # so only use that if this comment has no associated name.
if u.get_full_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: elif not self.user_name:
self._userinfo["name"] = u.username userinfo["name"] = u.username
self._userinfo = userinfo
return self._userinfo return self._userinfo
userinfo = property(_get_userinfo, doc=_get_userinfo.__doc__) userinfo = property(_get_userinfo, doc=_get_userinfo.__doc__)