* meta: Drop support for "meta link", since supporting this for internal

* map: Don't inline images.

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index b08d78d76dc6752ee37012bb3df707eba7faefc4..5b6af1f36f6ce0c6cc9605365ed491d123d09efd 100644 (file)
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -97,7 +97,9 @@ sub preprocess (@) { #{{{
                                $dummy=1;
                                $p.="/".shift(@bits);
                                $map .= "<li>"
                                $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;
                        }
                                        ."\n";
                                $openli=1;
                        }


@@ -108,7 +110,8 @@ sub preprocess (@) { #{{{
                $map .= "</li>\n" if $openli;
                $map .= "<li>"
                        .htmllink($params{page}, $params{destpage}, 
                $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;
                        ."\n";
                $openli=1;
                $parent=$item;

diff --git a/debian/changelog b/debian/changelog
index 6e769131a543fd0ac3e5bffa2065db4bc08af46e..940993baf90d237f804df8c8e34d7e6f079444bd 100644 (file)
--- 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.
   * 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.
     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.
     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
 
 
  -- 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 32952022cc1cd32d90d451d2c302ff7b2864fe03..d9d07c65ffb0bc9c1a86966ba6e580b74a5aeb42 100644 (file)
--- 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
 
 
 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]]