Merge commit 'upstream/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 3f17df4a3bb9a07a4e936f5a58c88b74841875ea..7881becd5a1174f3539a93385d415a906574ada7 100644 (file)
--- a/IkiWiki/Plugin/camelcase.pm
+++ b/IkiWiki/Plugin/camelcase.pm
@@ -42,7 +42,7 @@ sub linkify (@) { #{{{
        my $destpage=$params{destpage};
 
        $params{content}=~s{$link_regexp}{
        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};


@@ -54,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);

        }
 }
 
        }
 }