Bugfix for trying to attach files to a subpage of the index page.

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 4d6dee23e75a2fe4e1f76889b53b19e68483c001..52bac7c1e937ba87e2711ff41319e13a5cfd7814 100644 (file)
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -303,8 +303,8 @@ sub attachment_location ($) {
        my $page=shift;
        
        # Put the attachment in a subdir of the page it's attached
        my $page=shift;
        
        # Put the attachment in a subdir of the page it's attached

-       # to, unless that page is an "index" page.
-       $page=~s/(^|\/)index//;
+       # to, unless that page is the "index" page.
+       return "" if $page eq 'index';

        $page.="/" if length $page;
        
        return $page;
        $page.="/" if length $page;
        
        return $page;

diff --git a/debian/changelog b/debian/changelog
index ece9df882ced98f202a1c8da77a493a365eb6f8e..f51d41c2a841a58e59cf4edeac007c68fcd5b52a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,7 @@ ikiwiki (3.20110609) UNRELEASED; urgency=low
     markdown when forcing urls absolute.
   * Bugfix for wikilink containing an email address not showing up in 
     brokenlinks list.
     markdown when forcing urls absolute.
   * Bugfix for wikilink containing an email address not showing up in 
     brokenlinks list.

+  * Bugfix for trying to attach files to a subpage of the index page.

 
  -- Joey Hess <joeyh@debian.org>  Thu, 09 Jun 2011 10:06:44 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Thu, 09 Jun 2011 10:06:44 -0400
 

diff --git a/doc/bugs/Unable_to_add_attachments_to_some_pages.mdwn b/doc/bugs/Unable_to_add_attachments_to_some_pages.mdwn
index a9255ba3aacd1ae2f2797a176506beb0e3c47fcb..c7fe0bd1553b1945a13b8f6798784b408940b2a5 100644 (file)
--- a/doc/bugs/Unable_to_add_attachments_to_some_pages.mdwn
+++ b/doc/bugs/Unable_to_add_attachments_to_some_pages.mdwn
@@ -24,3 +24,8 @@ Please advise.
 >> I dont have an `allowed_attachments` section in my setup file
 >> But I've set an `allowed_attachments` like `allowed_attachments => 'maxsize(40000kb) and mimetype(*)',` and I still get the error.
 >> Thanks --[[aland]]
 >> I dont have an `allowed_attachments` section in my setup file
 >> But I've set an `allowed_attachments` like `allowed_attachments => 'maxsize(40000kb) and mimetype(*)',` and I still get the error.
 >> Thanks --[[aland]]

+
+>>> Being the subpage of index is the problem. It's not usual to have
+>>> any other page as a subpage of index; as there's really no reason to do
+>>> that, so some code broke in that special case. [[fixed|done]]
+>>> --[[Joey]]