From 5aee8d937d694dc5ae43b85c6d81ce9d268d1626 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 1 Jul 2008 13:39:02 -0400 Subject: bugfixes --- IkiWiki/Plugin/attachment.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'IkiWiki/Plugin') diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm index f9d7f14f6..d2989bb8b 100644 --- a/IkiWiki/Plugin/attachment.pm +++ b/IkiWiki/Plugin/attachment.pm @@ -32,7 +32,7 @@ sub formbuilder (@) { #{{{ if ($form->submitted eq "Upload") { my $q=$params{cgi}; - my $filename=IkiWiki::basename($q->param('attachment')); + my $filename=$q->param('attachment'); if (! defined $filename || ! length $filename) { # no file, so do nothing return; @@ -46,11 +46,11 @@ sub formbuilder (@) { #{{{ # to, unless that page is an "index" page. my $page=$form->field('page'); $page=~s/(^|\/)index//; - $filename="$page/$filename"; + $filename=$page."/".IkiWiki::basename($filename); # To untaint the filename, escape any hazardous characters, # and make sure it isn't pruned. - $filename=IkiWiki::titlepage(IkiWiki::possibly_foolish_untaint($filename); + $filename=IkiWiki::titlepage(IkiWiki::possibly_foolish_untaint($filename)); if (IkiWiki::file_pruned($filename, $config{srcdir})) { error(gettext("bad attachment filename")); } @@ -71,7 +71,7 @@ sub formbuilder (@) { #{{{ # Move the attachment into place. # Try to use a fast rename; fall back to copying. - prep_writefile($filename, $config{srcdir}); + IkiWiki::prep_writefile($filename, $config{srcdir}); unlink($config{srcdir}."/".$filename); if (! rename($tempfile, $config{srcdir}."/".$filename)) { my $fh=$q->upload('attachment'); -- cgit v1.2.3 e='committer'>committer
path: root/tags/a5/cb
diff options
context:
space:
mode:
Diffstat (limited to 'tags/a5/cb')
-rw-r--r--tags/a5/cb/20040721091539.GA23201@bzzware.org/debian0
-rw-r--r--tags/a5/cb/20040721091539.GA23201@bzzware.org/inbox0
-rw-r--r--tags/a5/cb/20040721091539.GA23201@bzzware.org/old0
-rw-r--r--tags/a5/cb/20100522184326.918C1B0CD51@mail.dandomain.dk/inbox0
-rw-r--r--tags/a5/cb/20100522184326.918C1B0CD51@mail.dandomain.dk/old0
-rw-r--r--tags/a5/cb/20170711070002.C16EF70A5@lxp5.free-owl.de/sys0
-rw-r--r--tags/a5/cb/20170711070002.C16EF70A5@lxp5.free-owl.de/unread0
-rw-r--r--tags/a5/cb/CAD=QJKgMLCW5Z_1czJjDZUWmJxOUQmTDh_3XENVpX7jV8YFgnQ@mail.gmail.com/debian0
-rw-r--r--tags/a5/cb/CAD=QJKgMLCW5Z_1czJjDZUWmJxOUQmTDh_3XENVpX7jV8YFgnQ@mail.gmail.com/inbox0
-rw-r--r--tags/a5/cb/CAD=QJKgMLCW5Z_1czJjDZUWmJxOUQmTDh_3XENVpX7jV8YFgnQ@mail.gmail.com/old0
-rw-r--r--tags/a5/cb/CAKaEYh+d3U8Y50mSWkmsZBtVuJv++Ckdi9NH0h2NG9zCkNkeZA@mail.gmail.com/inbox0
-rw-r--r--tags/a5/cb/CAKaEYh+d3U8Y50mSWkmsZBtVuJv++Ckdi9NH0h2NG9zCkNkeZA@mail.gmail.com/old0
-rw-r--r--tags/a5/cb/E1onHaF-002WzN-Qo@usper.debian.org/debian0
-rw-r--r--tags/a5/cb/E1onHaF-002WzN-Qo@usper.debian.org/inbox0
-rw-r--r--tags/a5/cb/E1onHaF-002WzN-Qo@usper.debian.org/killed0
-rw-r--r--tags/a5/cb/E1onHaF-002WzN-Qo@usper.debian.org/unread0
-rw-r--r--tags/a5/cb/alpine.DEB.2.22.394.2207200906430.270957@bear.techie.net/debian0
-rw-r--r--tags/a5/cb/l0313030db1352fade1c2@%5b194.239.159.70%5d/hb0
-rw-r--r--tags/a5/cb/l0313030db1352fade1c2@%5b194.239.159.70%5d/inbox0
-rw-r--r--tags/a5/cb/l0313030db1352fade1c2@%5b194.239.159.70%5d/old0
-rw-r--r--tags/a5/cb/mailman.70.1588921202.30193.pkg-sugar-devel@alioth-lists.debian.net/inbox0
-rw-r--r--tags/a5/cb/mailman.70.1588921202.30193.pkg-sugar-devel@alioth-lists.debian.net/killed0
-rw-r--r--tags/a5/cb/mailman.70.1588921202.30193.pkg-sugar-devel@alioth-lists.debian.net/sugar0
-rw-r--r--tags/a5/cb/mailman.70.1588921202.30193.pkg-sugar-devel@alioth-lists.debian.net/unread0
24 files changed, 0 insertions, 0 deletions