summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2007-12-26 10:49:15 -0500
committerJoey Hess <joey@kitenet.net>2007-12-26 10:49:15 -0500
commit2332b40595774cdc0c3d12573e4b0631c9707624 (patch)
tree046e1abcc36004de784e98debe66412263b2e845
parent7a4181e8ebd18b53eb2fd8bdf9235923a5bbf91c (diff)
* img: Avoid nesting images when linking to another image. Closes: #457780
-rw-r--r--IkiWiki/Plugin/img.pm3
-rw-r--r--debian/changelog1
2 files changed, 3 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 14a32f635..9385f6417 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -108,7 +108,8 @@ sub preprocess (@) { #{{{
}
elsif (length bestlink($params{page}, $params{link})) {
return htmllink($params{page}, $params{destpage},
- $params{link}, linktext => $imgtag);
+ $params{link}, linktext => $imgtag,
+ noimageinline => 1);
}
else {
return $imgtag;
diff --git a/debian/changelog b/debian/changelog
index 8d91bd95c..81f31353b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ikiwiki (2.17) UNRELEASED; urgency=low
* Improved parentlinks special case for index pages.
* redir: Support for specifying anchors.
+ * img: Avoid nesting images when linking to another image. Closes: #457780
-- Joey Hess <joeyh@debian.org> Wed, 19 Dec 2007 16:39:07 -0500