summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-11-09 20:58:24 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-11-09 20:58:24 +0000
commit54c90b2d41488657c583e657b16e363c9eb999fa (patch)
treebea8adcbe8ac51b966b41f4c2cceb622d06932e8
parentc16fd3d71f88f7db37ed7e5e3c017ce6c21ddaef (diff)
* Fix img plugin's handling of adding dependencies for images that do not
yet exist.
-rw-r--r--IkiWiki/Plugin/img.pm2
-rw-r--r--debian/changelog4
2 files changed, 4 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index bde5a3e1a..20893f56c 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -34,8 +34,8 @@ sub preprocess (@) { #{{{
return '';
}
+ add_depends($params{page}, $image);
my $file = bestlink($params{page}, $image) || return "[[img $image not found]]";
- add_depends($params{page}, $file);
my $dir = IkiWiki::dirname($file);
my $base = IkiWiki::basename($file);
diff --git a/debian/changelog b/debian/changelog
index d4a3a9c6f..427480ceb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ ikiwiki (1.33) UNRELEASED; urgency=low
* Fix some issues with the new registration form.
* Patch from Ethan Glasser Camp to add a skip option to the inline plugin.
* Make sure to check for errors from every eval.
+ * Fix img plugin's handling of adding dependencies for images that do not
+ yet exist.
- -- Joey Hess <joeyh@debian.org> Wed, 8 Nov 2006 15:57:35 -0500
+ -- Joey Hess <joeyh@debian.org> Thu, 9 Nov 2006 15:57:52 -0500
ikiwiki (1.32) unstable; urgency=low