diff options
| author | Joey Hess <joey@kitenet.net> | 2011-03-21 14:21:55 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-03-21 14:21:55 -0400 |
| commit | 26eb86d9036f8191db0c86031afe648dd6ba4ebc (patch) | |
| tree | f651b8ffae41bbd40390129918ac34fc330ac8c0 | |
| parent | b02d3746e1585b9cd2ce176e3e475eadf6eaa293 (diff) | |
Avoid escaping / characters in filenames when building the cgiurl, as this confuses eg, cvsweb.
| -rw-r--r-- | IkiWiki/Render.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 3 insertions, 1 deletions
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 <joeyh@debian.org> Sun, 27 Feb 2011 18:14:05 -0400 |