]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - IkiWiki/Plugin/attachment.pm
Merge branch 'ready/templatebody'
[git.ikiwiki.info.git] / IkiWiki / Plugin / attachment.pm
index fd4096edf7de153ef01145f310c459f255e3fffc..d56dd18ad8ded90e3dd6f46598e7bc632359d4b5 100644 (file)
@@ -148,7 +148,7 @@ sub formbuilder (@) {
                        $f=Encode::decode_utf8($f);
                        $f=~s/^$page\///;
                        if (IkiWiki::isinlinableimage($f) &&
-                           UNIVERSAL::can("IkiWiki::Plugin::img", "import")) {
+                           IkiWiki::Plugin::img->can("import")) {
                                $add.='[[!img '.$f.' align="right" size="" alt=""]]';
                        }
                        else {
@@ -229,8 +229,10 @@ sub attachment_store {
                check_canattach($session, $final_filename, $tempfile);
        };
        if ($@) {
-               json_response($q, $form, $dest."/".$filename, $@);
-               error $@;
+               # save error in case called functions clobber $@
+               my $error = $@;
+               json_response($q, $form, $dest."/".$filename, $error);
+               error $error;
        }
 
        # Move the attachment into holding directory.
@@ -272,20 +274,21 @@ sub attachments_save {
        my @attachments;
        my $dir=attachment_holding_location($form->field('page'));
        foreach my $filename (glob("$dir/*")) {
+               $filename=Encode::decode_utf8($filename);
                next unless -f $filename;
-               my $destdir=$config{srcdir}."/".
-                       linkpage(IkiWiki::possibly_foolish_untaint(
-                               attachment_location($form->field('page'))));
+               my $destdir=linkpage(IkiWiki::possibly_foolish_untaint(
+                       attachment_location($form->field('page'))));
+               my $absdestdir=$config{srcdir}."/".$destdir;
                my $destfile=IkiWiki::basename($filename);
-               my $dest=$destdir.$destfile;
+               my $dest=$absdestdir.$destfile;
                unlink($dest);
-               IkiWiki::prep_writefile($destfile, $destdir);
+               IkiWiki::prep_writefile($destfile, $absdestdir);
                rename($filename, $dest);
-               push @attachments, $dest;
+               push @attachments, $destdir.$destfile;
        }
        return unless @attachments;
        require IkiWiki::Render;
-       IkiWiki::prune($dir);
+       IkiWiki::prune($dir, $config{wikistatedir}."/attachments");
 
        # Check the attachments in and trigger a wiki refresh.
        if ($config{rcs}) {
@@ -345,6 +348,7 @@ sub attachment_list ($) {
        my $dir=attachment_holding_location($page);
        my $heldmsg=gettext("this attachment is not yet saved");
        foreach my $file (glob("$dir/*")) {
+               $file=Encode::decode_utf8($file);
                next unless -f $file;
                my $base=IkiWiki::basename($file);
                my $f=$loc.$base;