attachment: Do not escape _ when determining attachment filenames.

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 01d0d24784316b7302beee90f5df4d9580a5575d..3982c4883a39be7f12265bb62c538094390339d1 100644 (file)
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -102,7 +102,7 @@ sub formbuilder (@) { #{{{
                        }
                }
 
                        }
                }
 

-               $filename=IkiWiki::titlepage(
+               $filename=IkiWiki::linkpage(

                        IkiWiki::possibly_foolish_untaint(
                                attachment_location($form->field('page')).
                                IkiWiki::basename($filename)));
                        IkiWiki::possibly_foolish_untaint(
                                attachment_location($form->field('page')).
                                IkiWiki::basename($filename)));

diff --git a/debian/changelog b/debian/changelog
index 7ab18a2c70eb348e6ec2ceac21ed34fdb4b726f3..c699f698b5a300a358049182822e8412f49f3761 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ ikiwiki (2.55) UNRELEASED; urgency=low
   * Add allow_symlinks_before_srcdir config setting that can be used to avoid
     a security check that is a good safe default, but problimatic overkill in
     some situations.
   * Add allow_symlinks_before_srcdir config setting that can be used to avoid
     a security check that is a good safe default, but problimatic overkill in
     some situations.

+  * attachment: Do not escape _ when determining attachment filenames.

 
  -- Joey Hess <joeyh@debian.org>  Mon, 21 Jul 2008 11:35:46 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Mon, 21 Jul 2008 11:35:46 -0400
 

diff --git a/doc/bugs/attachment:_escaping_underscores_in_filename__63__.mdwn b/doc/bugs/attachment:_escaping_underscores_in_filename__63__.mdwn
index 509edd3fa7a27693e4f07c731e4d69f5553bc2c0..d7d101700481305062fcf0baf5781bb97c3a4f0b 100644 (file)
--- a/doc/bugs/attachment:_escaping_underscores_in_filename__63__.mdwn
+++ b/doc/bugs/attachment:_escaping_underscores_in_filename__63__.mdwn
@@ -15,3 +15,5 @@ Is it a bug or security feature? --[[Paweł|ptecza]]
 >> and `myisam__95__vs__95__ndb.ods` files. When I click "Attachments" link,
 >> I can't see my uploaded files, because there are in another subdirectory
 >> (`myisam__95__vs__95__ndb` instead of `myisam_vs_ndb`).  --[[Paweł|ptecza]]
 >> and `myisam__95__vs__95__ndb.ods` files. When I click "Attachments" link,
 >> I can't see my uploaded files, because there are in another subdirectory
 >> (`myisam__95__vs__95__ndb` instead of `myisam_vs_ndb`).  --[[Paweł|ptecza]]

+
+> [[done]], uses `linkpage` now.