web commit by PaulWise: add pabs' site/blog

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

diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index 1685d37a4a7312e559f42f68e6efa6f35dd93f43..a49726768762ac51f8b950630d104d2fd69c3e54 100644 (file)
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -6,28 +6,31 @@ package IkiWiki::Plugin::sidebar;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 
 sub import { #{{{
 
 sub import { #{{{

-       IkiWiki::hook(type => "pagetemplate", id => "sidebar", 
-               call => \&pagetemplate);
+       hook(type => "pagetemplate", id => "sidebar", call => \&pagetemplate);

 } # }}}
 
 sub sidebar_content ($) { #{{{
        my $page=shift;
        
 } # }}}
 
 sub sidebar_content ($) { #{{{
        my $page=shift;
        

-       my $sidebar_page=IkiWiki::bestlink($page, "sidebar") || return;
-       my $sidebar_file=$IkiWiki::pagesources{$sidebar_page} || return;
-       my $sidebar_type=IkiWiki::pagetype($sidebar_file);
+       my $sidebar_page=bestlink($page, "sidebar") || return;
+       my $sidebar_file=$pagesources{$sidebar_page} || return;
+       my $sidebar_type=pagetype($sidebar_file);

        
        if (defined $sidebar_type) {
        
        if (defined $sidebar_type) {

-               IkiWiki::add_depends($page, $sidebar_page);
-               my $content=IkiWiki::readfile(IkiWiki::srcfile($sidebar_file));
+               # 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.
+               add_depends($page, $sidebar_page);
+
+               my $content=readfile(srcfile($sidebar_file));

                return unless length $content;
                return unless length $content;

-               return IkiWiki::htmlize($sidebar_type,
-                      IkiWiki::preprocess($sidebar_page, $page,
+               return IkiWiki::htmlize($page, $sidebar_type,

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

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

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