aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-04-01 20:53:03 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-04-01 20:53:03 +0000
commitbf9e8bc900e344e8382c8e96001a74eb2e0b9629 (patch)
tree12da4b976098d0becadf4b88d1d714f9f5a1fe01 /IkiWiki
parent6351ae2ac4ffe01aba0733469751be7e058e6e61 (diff)
downloadikiwiki-bf9e8bc900e344e8382c8e96001a74eb2e0b9629.tar
ikiwiki-bf9e8bc900e344e8382c8e96001a74eb2e0b9629.tar.gz
* Fix a big in the img plugin that caused thumbnailed files to not be
tracked properly.
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/Plugin/img.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 0606f5001..8888b3a56 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -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";