* Deal better with rebuilds that involve moving files; track and clean up the

[git.ikiwiki.info.git] / IkiWiki / Plugin / img.pm

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 0503f4097c336b1194e023231d87738238a0b6e2..b1c9db80c969055edc59227b5c79d83945b7b911 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -34,7 +34,7 @@ sub preprocess (@) { #{{{
        push @{$links{$params{page}}}, $image;
        my $file = bestlink($params{page}, $image);
 
        push @{$links{$params{page}}}, $image;
        my $file = bestlink($params{page}, $image);
 

-       my $dir = IkiWiki::dirname($file);
+       my $dir = $params{page};

        my $base = IkiWiki::basename($file);
 
        eval q{use Image::Magick};
        my $base = IkiWiki::basename($file);
 
        eval q{use Image::Magick};


@@ -50,7 +50,7 @@ sub preprocess (@) { #{{{
 
                my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
                $imglink = "$dir/${w}x${h}-$base";
 
                my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
                $imglink = "$dir/${w}x${h}-$base";

-                               
+               

                will_render($params{page}, $imglink);
 
                if (-e $outfile && (-M srcfile($file) >= -M $outfile)) {
                will_render($params{page}, $imglink);
 
                if (-e $outfile && (-M srcfile($file) >= -M $outfile)) {