From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Fri, 18 Aug 2006 00:44:46 +0000 (+0000)
Subject: * Call filter hooks on inlined page content.
X-Git-Tag: 1.21~30
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/69d1592a177acb8fbfaabeeb4e26431966d9165e

* Call filter hooks on inlined page content.
---

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 935df9a77..5c2aeb6c7 100644
--- 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) {
-		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 "";
diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index a6efc6b8e..1685d37a4 100644
--- 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,
-		       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 9223500f9..88dbb35d8 100644
--- 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.
+  * 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