bugfixes

[ikiwiki.git] / IkiWiki / Plugin / link.pm

diff --git a/IkiWiki/Plugin/link.pm b/IkiWiki/Plugin/link.pm
index 957355643d46badc05c2fd73d7f4b66b042669a1..3838aec09708450d8d3f9ba338b3cb3b09ee6892 100644 (file)
--- a/IkiWiki/Plugin/link.pm
+++ b/IkiWiki/Plugin/link.pm
@@ -3,27 +3,28 @@ package IkiWiki::Plugin::link;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 my $link_regexp;
 
-sub import { #{{{
+sub import {
        hook(type => "getsetup", id => "link", call => \&getsetup);
        hook(type => "checkconfig", id => "link", call => \&checkconfig);
        hook(type => "linkify", id => "link", call => \&linkify);
        hook(type => "scan", id => "link", call => \&scan);
        hook(type => "renamepage", id => "link", call => \&renamepage);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
        return
                plugin => {
                        safe => 1,
                        rebuild => 1,
+                       section => "core",
                },
-} #}}}
+}
 
-sub checkconfig () { #{{{
+sub checkconfig () {
        if ($config{prefix_directives}) {
                $link_regexp = qr{
                        \[\[(?=[^!])            # beginning of link
@@ -58,9 +59,9 @@ sub checkconfig () { #{{{
                        \]\]                    # end of link
                }x,
        }
-} #}}}
+}
 
-sub linkify (@) { #{{{
+sub linkify (@) {
        my %params=@_;
        my $page=$params{page};
        my $destpage=$params{destpage};
@@ -69,28 +70,28 @@ sub linkify (@) { #{{{
                defined $2
                        ? ( $1 
                                ? "[[$2|$3".($4 ? "#$4" : "")."]]" 
-                               : htmllink($page, $destpage, IkiWiki::linkpage($3),
-                                       anchor => $4, linktext => IkiWiki::pagetitle($2)))
+                               : htmllink($page, $destpage, linkpage($3),
+                                       anchor => $4, linktext => pagetitle($2)))
                        : ( $1 
                                ? "[[$3".($4 ? "#$4" : "")."]]"
-                               : htmllink($page, $destpage, IkiWiki::linkpage($3),
+                               : htmllink($page, $destpage, linkpage($3),
                                        anchor => $4))
        }eg;
        
        return $params{content};
-} #}}}
+}
 
-sub scan (@) { #{{{
+sub scan (@) {
        my %params=@_;
        my $page=$params{page};
        my $content=$params{content};
 
        while ($content =~ /(?<!\\)$link_regexp/g) {
-               push @{$links{$page}}, IkiWiki::linkpage($2);
+               add_link($page, linkpage($2));
        }
-} # }}}
+}
 
-sub renamepage (@) { #{{{
+sub renamepage (@) {
        my %params=@_;
        my $page=$params{page};
        my $old=$params{oldpage};
@@ -99,8 +100,8 @@ sub renamepage (@) { #{{{
        $params{content} =~ s{(?<!\\)$link_regexp}{
                my $linktext=$2;
                my $link=$linktext;
-               if (bestlink($page, IkiWiki::linkpage($linktext)) eq $old) {
-                       $link=IkiWiki::pagetitle($new, 1);
+               if (bestlink($page, linkpage($linktext)) eq $old) {
+                       $link=pagetitle($new, 1);
                        $link=~s/ /_/g;
                        if ($linktext =~ m/.*\/*?[A-Z]/) {
                                # preserve leading cap of last component
@@ -118,6 +119,6 @@ sub renamepage (@) { #{{{
        }eg;
 
        return $params{content};
-} #}}}
+}
 
 1