Avoid escaping / characters in filenames when building the cgiurl, as this confuses...

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 8e8336b994070f442061e8bc2929525a77033549..5288abc6dc40549c8debe95c6259172deb51b7b1 100644 (file)
--- 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};
        }
        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++;
                $u=~s/\[\[file\]\]/$p/g;
                $template->param(historyurl => $u);
                $actions++;

diff --git a/debian/changelog b/debian/changelog
index 26b80eca6ba5cf34a3959069e024e484994c26a7..15328d694a7332037992d9d878242992b2dea496 100644 (file)
--- 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)
     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
 
 
  -- Joey Hess <joeyh@debian.org>  Sun, 27 Feb 2011 18:14:05 -0400