diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-05-24 19:56:08 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-05-24 19:56:08 +0000 |
| commit | 8c2c8c6bea57e4d9119500b866f6bd286533d4ea (patch) | |
| tree | 1f0f97a7c245e007ab9f7f5d853413981bf1e43f /IkiWiki | |
| parent | 31eab66e8a54637667745e5ad8c13381b4a05246 (diff) | |
| download | ikiwiki-8c2c8c6bea57e4d9119500b866f6bd286533d4ea.tar ikiwiki-8c2c8c6bea57e4d9119500b866f6bd286533d4ea.tar.gz | |
* Deal better with rebuilds that involve moving files; track and clean up the
old files.
* Change where the img plugin puts scaled images. It's better to make the
scaled images subpages of the page that embeds them, rather than putting
them alongside the original image, since if two pages scale the same image
the same way, this prevents complications in dealing with two pages
creating the same file. The move will be handled transparently, though you
might want to rebuild your wiki to make it occur in one step.
Diffstat (limited to 'IkiWiki')
| -rw-r--r-- | IkiWiki/Plugin/img.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm index 0503f4097..b1c9db80c 100644 --- 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); - my $dir = IkiWiki::dirname($file); + my $dir = $params{page}; 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"; - + will_render($params{page}, $imglink); if (-e $outfile && (-M srcfile($file) >= -M $outfile)) { |