comments: Remove ipv6 address specific code.

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 285013e49175c8651055bb53e34e71e44115699c..c00bf52752e9326a3ffc40855ed8b130dced74ce 100644 (file)
--- 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 5a6f7f437fc499a6de8a59bd121aef0026712cc0..8c1c685be33f540a15627907dc1e44de3dc9256e 100644 (file)
--- 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 55d66e785b346e9bd91c4128806b31414796c8a4..5e535b9196298d0e29f4b3e409ee57fa0e1d256b 100644 (file)
--- 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]]