summaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin/tag.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/tag.pm
parentd92142d09eaec9018c0cdc96f9ad3bd4a0c876a7 (diff)
* 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/tag.pm')
-rw-r--r--IkiWiki/Plugin/tag.pm21
1 files changed, 9 insertions, 12 deletions
diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 3de09a767..7a1be6bec 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -9,26 +9,23 @@ use IkiWiki;
my %tags;
sub import { #{{{
- IkiWiki::hook(type => "getopt", id => "tag",
- call => \&getopt);
- IkiWiki::hook(type => "preprocess", id => "tag",
- call => \&preprocess);
- IkiWiki::hook(type => "pagetemplate", id => "tag",
- call => \&pagetemplate);
+ hook(type => "getopt", id => "tag", call => \&getopt);
+ hook(type => "preprocess", id => "tag", call => \&preprocess);
+ hook(type => "pagetemplate", id => "tag", call => \&pagetemplate);
} # }}}
sub getopt () { #{{{
eval q{use Getopt::Long};
Getopt::Long::Configure('pass_through');
- GetOptions("tagbase=s" => \$IkiWiki::config{tagbase});
+ GetOptions("tagbase=s" => \$config{tagbase});
} #}}}
sub tagpage ($) { #{{{
my $tag=shift;
- if (exists $IkiWiki::config{tagbase} &&
- defined $IkiWiki::config{tagbase}) {
- $tag=$IkiWiki::config{tagbase}."/".$tag;
+ if (exists $config{tagbase} &&
+ defined $config{tagbase}) {
+ $tag=$config{tagbase}."/".$tag;
}
return $tag;
@@ -47,7 +44,7 @@ sub preprocess (@) { #{{{
foreach my $tag (keys %params) {
push @{$tags{$page}}, $tag;
# hidden WikiLink
- push @{$IkiWiki::links{$page}}, tagpage($tag);
+ push @{$links{$page}}, tagpage($tag);
}
return "";
@@ -61,7 +58,7 @@ sub pagetemplate (@) { #{{{
$template->param(tags => [
map {
- link => IkiWiki::htmllink($page, $destpage, tagpage($_))
+ link => htmllink($page, $destpage, tagpage($_))
}, @{$tags{$page}}
]) if exists $tags{$page} && @{$tags{$page}} && $template->query(name => "tags");