diff options
| author | Joey Hess <joey@kitenet.net> | 2012-08-25 10:43:24 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-08-25 10:43:24 -0400 |
| commit | a3c1768e109f5f125ca3b9f4e8e2adbd4c2e5abc (patch) | |
| tree | d02fd1e9c1e0ec98e972ea3a016145976167c2e8 | |
| parent | 4d2f4009cbc29882de1e32956f300d0884f56b0c (diff) | |
| download | ikiwiki-a3c1768e109f5f125ca3b9f4e8e2adbd4c2e5abc.tar ikiwiki-a3c1768e109f5f125ca3b9f4e8e2adbd4c2e5abc.tar.gz | |
comments: Remove ipv6 address specific code.
| -rw-r--r-- | IkiWiki/Plugin/comments.pm | 5 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | 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 <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]] |