todo

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

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 0606f5001170190b4177eea63240ad808889ffa6..7226231a05bd74f01aeeebed3293e60ada885e28 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -5,7 +5,7 @@ package IkiWiki::Plugin::img;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 
 my %imgdefaults;
 
@@ -51,6 +51,8 @@ sub preprocess (@) { #{{{
 
                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)) {
                        $r = $im->Read($outfile);
@@ -65,7 +67,6 @@ sub preprocess (@) { #{{{
 
                        # don't actually write file in preview mode
                        if (! $params{preview}) {
-                               will_render($params{page}, $imglink);
                                my @blob = $im->ImageToBlob();
                                writefile($imglink, $config{destdir}, $blob[0], 1);
                        }
@@ -84,8 +85,8 @@ sub preprocess (@) { #{{{
 
        my ($fileurl, $imgurl);
        if (! $params{preview}) {
-               $fileurl=IkiWiki::abs2rel($file, IkiWiki::dirname($params{destpage}));
-               $imgurl=IkiWiki::abs2rel($imglink, IkiWiki::dirname($params{destpage}));
+               $fileurl=urlto($file, $params{destpage});
+               $imgurl=urlto($imglink, $params{destpage});
        }
        else {
                $fileurl="$config{url}/$file";