From a3c1768e109f5f125ca3b9f4e8e2adbd4c2e5abc Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 25 Aug 2012 10:43:24 -0400 Subject: [PATCH] comments: Remove ipv6 address specific code. --- IkiWiki/Plugin/comments.pm | 5 +---- debian/changelog | 1 + doc/bugs/ipv6_address_in_comments.mdwn | 2 ++ 3 files changed, 4 insertions(+), 4 deletions(-) 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 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]] -- 2.39.5