* Call filter hooks on inlined page content.

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 935df9a7764cb451d37705b7e10b0f8b105156d5..5c2aeb6c7ccecde1ec6df7c0a32ec3986cdbe2de 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -130,7 +130,11 @@ sub get_inline_content ($$) { #{{{
        my $file=$pagesources{$page};
        my $type=pagetype($file);
        if (defined $type) {
        my $file=$pagesources{$page};
        my $type=pagetype($file);
        if (defined $type) {

-               return htmlize($type, preprocess($page, $destpage, linkify($page, $destpage, readfile(srcfile($file)))));
+               return htmlize($type,
+                      preprocess($page, $destpage,
+                      linkify($page, $destpage,
+                      filter($page,
+                      readfile(srcfile($file))))));

        }
        else {
                return "";
        }
        else {
                return "";

diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index a6efc6b8e377a439694d965d8e16e83e2c06a66d..1685d37a4a7312e559f42f68e6efa6f35dd93f43 100644 (file)
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -26,7 +26,8 @@ sub sidebar_content ($) { #{{{
                return unless length $content;
                return IkiWiki::htmlize($sidebar_type,
                       IkiWiki::preprocess($sidebar_page, $page,
                return unless length $content;
                return IkiWiki::htmlize($sidebar_type,
                       IkiWiki::preprocess($sidebar_page, $page,

-                      IkiWiki::linkify($sidebar_page, $page, $content)));
+                      IkiWiki::linkify($sidebar_page, $page,
+                      IkiWiki::filter($sidebar_page, $content))));

        }
 
 } # }}}
        }
 
 } # }}}

diff --git a/debian/changelog b/debian/changelog
index 9223500f928a8de57f30f386e0ddba1e69ba42e6..88dbb35d88c29a52f64e12131eb389bfdab29a01 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ ikiwiki (1.21) UNRELEASED; urgency=low
   * If a page links to itself, mark up the link text in a span with
     class="selflink" so that it can be styled. I don't have a useful style
     defined for that though.
   * If a page links to itself, mark up the link text in a span with
     class="selflink" so that it can be styled. I don't have a useful style
     defined for that though.

+  * Call filter hooks on inlined page content.

 
 

- -- Joey Hess <joeyh@debian.org>  Thu, 17 Aug 2006 20:18:23 -0400
+ -- Joey Hess <joeyh@debian.org>  Thu, 17 Aug 2006 20:39:20 -0400

 
 ikiwiki (1.20) unstable; urgency=low
 
 
 ikiwiki (1.20) unstable; urgency=low