From 26eb86d9036f8191db0c86031afe648dd6ba4ebc Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 21 Mar 2011 14:21:55 -0400 Subject: [PATCH] Avoid escaping / characters in filenames when building the cgiurl, as this confuses eg, cvsweb. --- IkiWiki/Render.pm | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 8e8336b99..5288abc6d 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -93,7 +93,7 @@ sub genpage ($$) { } if (defined $config{historyurl} && length $config{historyurl}) { my $u=$config{historyurl}; - my $p=uri_escape_utf8($pagesources{$page}); + my $p=uri_escape_utf8($pagesources{$page}, '^A-Za-z0-9\-\._~/'); $u=~s/\[\[file\]\]/$p/g; $template->param(historyurl => $u); $actions++; diff --git a/debian/changelog b/debian/changelog index 26b80eca6..15328d694 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ ikiwiki (3.20110226) UNRELEASED; urgency=low Also, the cookiejar configuration setting can be used by other plugins to provide a custom `cookie_jar` object for LWP::UserAgent. (Thanks, schmonz) + * Avoid escaping / characters in filenames when building the cgiurl, + as this confuses eg, cvsweb. -- Joey Hess Sun, 27 Feb 2011 18:14:05 -0400 -- 2.32.0.93.g670b81a890