From dae0f48e91304afcb6ebe0936360e51b22a56548 Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Sat, 9 Sep 2006 22:50:27 +0000
Subject: * 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.

---
 IkiWiki/Plugin/map.pm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'IkiWiki/Plugin/map.pm')

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 27ae0c6a3..96daf39fc 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -12,8 +12,7 @@ use strict;
 use IkiWiki;
 
 sub import { #{{{
-	IkiWiki::hook(type => "preprocess", id => "map",
-		call => \&preprocess);
+	hook(type => "preprocess", id => "map", call => \&preprocess);
 } # }}}
 
 sub preprocess (@) { #{{{
@@ -22,12 +21,12 @@ sub preprocess (@) { #{{{
 	
 	# Needs to update whenever a page is added or removed, so
 	# register a dependency.
-	IkiWiki::add_depends($params{page}, $params{pages});
+	add_depends($params{page}, $params{pages});
 	
 	# Get all the items to map.
 	my @mapitems = ();
-	foreach my $page (keys %IkiWiki::links) {
-		if (IkiWiki::pagespec_match($page, $params{pages})) {
+	foreach my $page (keys %links) {
+		if (pagespec_match($page, $params{pages})) {
 			push @mapitems, $page;
 		}
 	}
@@ -50,7 +49,7 @@ sub preprocess (@) { #{{{
 		}
 		$map .= "</li>\n" if $openli;
 		$map .= "<li>"
-		        .IkiWiki::htmllink($params{page}, $params{destpage}, $item) ."\n";
+		        .htmllink($params{page}, $params{destpage}, $item) ."\n";
 		$openli=1;
 	}
 	while ($indent > 0) {
-- 
cgit v1.2.3