urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into next

master
Joey Hess 2008-12-26 14:07:25 -05:00
parent 914c839ceb 9db06329c9
commit 6f1539320b
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
IkiWiki/Plugin/comments.pm
View File

@ -198,8 +198,17 @@ sub preprocess {
$pagestate{$page}{meta}{author} = $params{claimedauthor}; $pagestate{$page}{meta}{author} = $params{claimedauthor};
} }
if (defined $params{url} and safeurl($params{url})) { if (defined $params{url}) {
$pagestate{$page}{meta}{authorurl} = $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 { else {

1
debian/changelog vendored
View File

@ -19,6 +19,7 @@ ikiwiki (2.72) unstable; urgency=low
* Add deprecation warning for GlobLists, which will stop working in 3.0. * Add deprecation warning for GlobLists, which will stop working in 3.0.
* camelcase: Add camelcase_ignore setting. * camelcase: Add camelcase_ignore setting.
* googlecalendar: Add runtime deprecation warning. * 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 -- Joey Hess <joeyh@debian.org> Wed, 24 Dec 2008 19:49:32 -0500