From 9459cc55abf94171b96f72c954032c6383fda0c3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 16 Dec 2007 16:00:13 -0500
Subject: * meta: Drop support for "meta link", since supporting this for
 internal * map: Don't inline images.

---
 IkiWiki/Plugin/map.pm                          | 7 +++++--
 debian/changelog                               | 3 ++-
 doc/bugs/sitemap_includes_images_directly.mdwn | 5 ++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index b08d78d76..5b6af1f36 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -97,7 +97,9 @@ sub preprocess (@) { #{{{
 				$dummy=1;
 				$p.="/".shift(@bits);
 				$map .= "<li>"
-					.htmllink($params{page}, $params{destpage}, $p, class => "mapparent")
+					.htmllink($params{page}, $params{destpage},
+						 $p, class => "mapparent",
+						 noimageinline => 1)
 					."\n";
 				$openli=1;
 			}
@@ -108,7 +110,8 @@ sub preprocess (@) { #{{{
 		$map .= "</li>\n" if $openli;
 		$map .= "<li>"
 			.htmllink($params{page}, $params{destpage}, 
-				"/".$common_prefix."/".$item, class => "mapitem")
+				"/".$common_prefix."/".$item,
+				class => "mapitem", noimageinline => 1)
 			."\n";
 		$openli=1;
 		$parent=$item;
diff --git a/debian/changelog b/debian/changelog
index 6e769131a..940993baf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,7 +38,7 @@ ikiwiki (2.16) UNRELEASED; urgency=low
   * Don't increment feed numbers when an inline has no feeds. (Nis Martensen)
   * Allow editing a page and deleting all content, while still disallowing
     creating a new page that's entirely empty.
-  * meta: Drop support for "meta link", since supporting this for internal 
+  * meta: Drop support for "meta link", since supporting this for internal
     links required meta to be run during scan, which complicated its data
     storage, since it had to clear data stored during the scan pass to avoid
     duplicating it during the normal preprocessing pass.
@@ -52,6 +52,7 @@ ikiwiki (2.16) UNRELEASED; urgency=low
     stored data before preprocessing, this hack was ugly, and broken (cf:
     liw's disappearing openids).
   * aggregate: Convert filter hook to a needsbuild hook.
+  * map: Don't inline images.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 03 Dec 2007 14:47:36 -0500
 
diff --git a/doc/bugs/sitemap_includes_images_directly.mdwn b/doc/bugs/sitemap_includes_images_directly.mdwn
index 32952022c..d9d07c65f 100644
--- a/doc/bugs/sitemap_includes_images_directly.mdwn
+++ b/doc/bugs/sitemap_includes_images_directly.mdwn
@@ -2,4 +2,7 @@ A bug in the plugin [[/plugins/map]]: It displays images inline.
 
 When I tried, it displayed the one image I have in my small wiki inline in the map. ideally it should link to it, just like it links to pages. [example at my site][uw]. Note that I normally keep images outside, but this time I thought, why not have it all at the same place? (Images are also contextual content (fits to its subpage))--ulrik
 
-[uw]: http://www.student.lu.se/~cif04usv/wiki/sitemap.html
\ No newline at end of file
+[uw]: http://www.student.lu.se/~cif04usv/wiki/sitemap.html
+
+> [[done]] (hope noone was relying on the map inlining their images..)
+> --[[Joey]]
-- 
cgit v1.2.3