Merge branch 'master' into next

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index c9c7b2ed4c8f4eaa09b110426f2619617376f927..ddaa707322c5dd1065e0e8630b5b391a06755e9b 100644 (file)
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -198,8 +198,17 @@ sub preprocess {
                        $pagestate{$page}{meta}{author} = $params{claimedauthor};
                }
 
-               if (defined $params{url} and safeurl($params{url})) {
-                       $pagestate{$page}{meta}{authorurl} = $params{url};
+               if (defined $params{url}) {
+                       my $url=$params{url};
+
+                       eval q{use URI::Heuristic}; 
+                       if (! $@) {
+                               $url=URI::Heuristic::uf_uristr($url);
+                       }
+
+                       if (safeurl($url)) {
+                               $pagestate{$page}{meta}{authorurl} = $url;
+                       }
                }
        }
        else {

diff --git a/debian/changelog b/debian/changelog
index 62ff1ba6f92c42ee311263a6333d459bb8198190..9a96f7415d6a4856c2e971eaea659ca451bef3ec 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ ikiwiki (2.72) unstable; urgency=low
   * Add deprecation warning for GlobLists, which will stop working in 3.0.
   * camelcase: Add camelcase_ignore setting.
   * googlecalendar: Add runtime deprecation warning.
+  * comments: Deal with users entering unqualified or partial urls.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 24 Dec 2008 19:49:32 -0500