* Generalised preprocesser loop protection code.

[git.ikiwiki.info.git] / IkiWiki / Plugin / sidebar.pm

diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index 1685d37a4a7312e559f42f68e6efa6f35dd93f43..e0e81526f080cdb502d0f72cfb8e4e4bf145303a 100644 (file)
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -21,12 +21,16 @@ sub sidebar_content ($) { #{{{
        my $sidebar_type=IkiWiki::pagetype($sidebar_file);
        
        if (defined $sidebar_type) {
        my $sidebar_type=IkiWiki::pagetype($sidebar_file);
        
        if (defined $sidebar_type) {

+               # FIXME: This isn't quite right; it won't take into account
+               # adding a new sidebar page. So adding such a page
+               # currently requires a wiki rebuild.

                IkiWiki::add_depends($page, $sidebar_page);
                IkiWiki::add_depends($page, $sidebar_page);

+

                my $content=IkiWiki::readfile(IkiWiki::srcfile($sidebar_file));
                return unless length $content;
                return IkiWiki::htmlize($sidebar_type,
                my $content=IkiWiki::readfile(IkiWiki::srcfile($sidebar_file));
                return unless length $content;
                return IkiWiki::htmlize($sidebar_type,

-                      IkiWiki::preprocess($sidebar_page, $page,

                       IkiWiki::linkify($sidebar_page, $page,
                       IkiWiki::linkify($sidebar_page, $page,

+                      IkiWiki::preprocess($sidebar_page, $page,

                       IkiWiki::filter($sidebar_page, $content))));
        }
 
                       IkiWiki::filter($sidebar_page, $content))));
        }