From: Joey Hess <joey@kitenet.net>
Date: Sat, 25 Aug 2012 14:43:24 +0000 (-0400)
Subject: comments: Remove ipv6 address specific code.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a3c1768e109f5f125ca3b9f4e8e2adbd4c2e5abc;p=ikiwiki.git

comments: Remove ipv6 address specific code.
---

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 285013e49..c00bf5275 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -443,10 +443,7 @@ sub editcomment ($$) {
 		$content .= " nickname=\"$nickname\"\n";
 	}
 	elsif (defined $session->remote_addr()) {
-		my $ip = $session->remote_addr();
-		if ($ip =~ m/^([.0-9]+)$/) {
-			$content .= " ip=\"$1\"\n";
-		}
+		$content .= " ip=\"".$session->remote_addr()."\"\n";
 	}
 
 	if ($config{comments_allowauthor}) {
diff --git a/debian/changelog b/debian/changelog
index 5a6f7f437..8c1c685be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ ikiwiki (3.20120630) UNRELEASED; urgency=low
     Thanks, Genevieve
   * osm: osm_layers can be used to configured the layers displayed on the map.
     Thanks, Antoine Beaupré
+  * comments: Remove ipv6 address specific code.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 19 Jul 2012 13:46:52 -0400
 
diff --git a/doc/bugs/ipv6_address_in_comments.mdwn b/doc/bugs/ipv6_address_in_comments.mdwn
index 55d66e785..5e535b919 100644
--- a/doc/bugs/ipv6_address_in_comments.mdwn
+++ b/doc/bugs/ipv6_address_in_comments.mdwn
@@ -13,3 +13,5 @@ the problem for me. Not sure if this is the best solution. --[[cstamas]]
 [[patch]]
 
 [[!tag ipv6]]
+
+> [[done]] --[[Joey]]