aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin/sidebar.pm
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-09-09 22:50:27 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-09-09 22:50:27 +0000
commitdae0f48e91304afcb6ebe0936360e51b22a56548 (patch)
tree930090e4343087dac7ae6693d420d80b826c57f2 /IkiWiki/Plugin/sidebar.pm
parentd92142d09eaec9018c0cdc96f9ad3bd4a0c876a7 (diff)
downloadikiwiki-dae0f48e91304afcb6ebe0936360e51b22a56548.tar
ikiwiki-dae0f48e91304afcb6ebe0936360e51b22a56548.tar.gz
* Work on firming up the plugin interface:
- Plugins should not need to load IkiWiki::Render to get commonly used functions, so moved some functions from there to IkiWiki. - Picked out the set of functions and variables that most plugins use, documented them, and made IkiWiki export them by default, like a proper perl module should. - Use the other functions at your own risk. - This is not quite complete, I still have to decide whether to export some other things. * Changed all plugins included in ikiwiki to not use "IkiWiki::" when referring to stuff now exported by the IkiWiki module. * Anyone with a third-party ikiwiki plugin is strongly enrouraged to make like changes to it and avoid use of non-exported symboles from "IkiWiki::". * Link debian/changelog and debian/news to NEWS and CHANGELOG. * Support hyperestradier version 1.4.2, which adds a new required phraseform setting.
Diffstat (limited to 'IkiWiki/Plugin/sidebar.pm')
-rw-r--r--IkiWiki/Plugin/sidebar.pm13
1 files changed, 6 insertions, 7 deletions
diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index 0b006f110..da1f82b82 100644
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -9,24 +9,23 @@ use strict;
use IkiWiki;
sub import { #{{{
- IkiWiki::hook(type => "pagetemplate", id => "sidebar",
- call => \&pagetemplate);
+ hook(type => "pagetemplate", id => "sidebar", call => \&pagetemplate);
} # }}}
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) {
# 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);
+ add_depends($page, $sidebar_page);
- my $content=IkiWiki::readfile(IkiWiki::srcfile($sidebar_file));
+ my $content=readfile(srcfile($sidebar_file));
return unless length $content;
return IkiWiki::htmlize($page, $sidebar_type,
IkiWiki::linkify($sidebar_page, $page,