summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-02-24 05:02:00 -0800
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-02-24 05:02:00 -0800
commit7106a1e594dc28108e7e4f83af3ffb25289d3bb0 (patch)
tree146415347270d1db0f4eeb7b88beee71e2bcbea3 /django
parentdeb4e097ae2a495480a2907028fc3c76eed0cbb7 (diff)
parentade992c61e15fbc83d87bfc688c0f844b6ef19fd (diff)
Merge pull request #819 from erikr/master
Fixed #16302 -- Ensured contrib.comments is IPv6 capable.
Diffstat (limited to 'django')
-rw-r--r--django/contrib/comments/models.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/comments/models.py b/django/contrib/comments/models.py
index c263ea7d10..bc4d932464 100644
--- a/django/contrib/comments/models.py
+++ b/django/contrib/comments/models.py
@@ -60,7 +60,7 @@ class Comment(BaseCommentAbstractModel):
# Metadata about the comment
submit_date = models.DateTimeField(_('date/time submitted'), default=None)
- ip_address = models.IPAddressField(_('IP address'), blank=True, null=True)
+ ip_address = models.GenericIPAddressField(_('IP address'), unpack_ipv4=True, blank=True, null=True)
is_public = models.BooleanField(_('is public'), default=True,
help_text=_('Uncheck this box to make the comment effectively ' \
'disappear from the site.'))