Merge commit 'origin/master' into pub/master

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

diff --git a/IkiWiki/Plugin/camelcase.pm b/IkiWiki/Plugin/camelcase.pm
index 0739bb01ae3c2d0498c58fa428451afb208fcfdf..7881becd5a1174f3539a93385d415a906574ada7 100644 (file)
--- a/IkiWiki/Plugin/camelcase.pm
+++ b/IkiWiki/Plugin/camelcase.pm
@@ -23,17 +23,26 @@ my $link_regexp=qr{
 }x;
 
 sub import { #{{{
 }x;
 
 sub import { #{{{

+       hook(type => "getsetup", id => "camelcase", call => \&getsetup);

        hook(type => "linkify", id => "camelcase", call => \&linkify);
        hook(type => "scan", id => "camelcase", call => \&scan);
 } # }}}
 
        hook(type => "linkify", id => "camelcase", call => \&linkify);
        hook(type => "scan", id => "camelcase", call => \&scan);
 } # }}}
 

+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               };
+} #}}}
+

 sub linkify (@) { #{{{
        my %params=@_;
        my $page=$params{page};
        my $destpage=$params{destpage};
 
        $params{content}=~s{$link_regexp}{
 sub linkify (@) { #{{{
        my %params=@_;
        my $page=$params{page};
        my $destpage=$params{destpage};
 
        $params{content}=~s{$link_regexp}{

-               htmllink($page, $destpage, IkiWiki::linkpage($1))
+               htmllink($page, $destpage, linkpage($1))

        }eg;
 
        return $params{content};
        }eg;
 
        return $params{content};


@@ -45,7 +54,7 @@ sub scan (@) { #{{{
         my $content=$params{content};
 
        while ($content =~ /$link_regexp/g) {
         my $content=$params{content};
 
        while ($content =~ /$link_regexp/g) {

-               push @{$links{$page}}, IkiWiki::linkpage($1);
+               push @{$links{$page}}, linkpage($1);

        }
 }
 
        }
 }