urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
Joey Hess 2011-07-07 20:32:14 -04:00
parent 786afc42e0
commit 9f7d9ab356
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IkiWiki/Plugin/attachment.pm
View File

@ -303,8 +303,8 @@ sub attachment_location ($) {
my $page=shift; my $page=shift;
# Put the attachment in a subdir of the page it's attached # Put the attachment in a subdir of the page it's attached
# to, unless that page is an "index" page. # to, unless that page is the "index" page.
$page=~s/(^|\/)index//; return "" if $page eq 'index';
$page.="/" if length $page; $page.="/" if length $page;
return $page; return $page;

1
debian/changelog vendored
View File

@ -31,6 +31,7 @@ ikiwiki (3.20110609) UNRELEASED; urgency=low
markdown when forcing urls absolute. markdown when forcing urls absolute.
* Bugfix for wikilink containing an email address not showing up in * Bugfix for wikilink containing an email address not showing up in
brokenlinks list. 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

5
doc/bugs/Unable_to_add_attachments_to_some_pages.mdwn
View File

@ -24,3 +24,8 @@ Please advise.
>> I dont have an `allowed_attachments` section in my setup file >> 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. >> But I've set an `allowed_attachments` like `allowed_attachments => 'maxsize(40000kb) and mimetype(*)',` and I still get the error.
>> Thanks --[[aland]] >> 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]]