* img: Avoid nesting images when linking to another image. Closes: #457780

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 14a32f63542fb827e40ff926771982436e02f59a..9385f64172024d45a7c71fb618ac5d0358dae45b 100644 (file)
--- 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},
        }
        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;
        }
        else {
                return $imgtag;

diff --git a/debian/changelog b/debian/changelog
index 8d91bd95cd7996984366c982be32528d8981fcd4..81f31353b238744e0b509c30f64a50429baf1508 100644 (file)
--- 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.
 
   * 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
 
 
  -- Joey Hess <joeyh@debian.org>  Wed, 19 Dec 2007 16:39:07 -0500