summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki/Plugin/comments.pm13
-rw-r--r--debian/changelog1
2 files changed, 12 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 0ae9eefe3..d8318d3e3 100644
--- 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 19b8cbdf7..96a70fcc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ikiwiki (2.72) UNRELEASED; 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> Mon, 22 Dec 2008 19:02:16 -0500