* Add no_override parameter to hook().

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

diff --git a/IkiWiki/Plugin/wikitext.pm b/IkiWiki/Plugin/wikitext.pm
index 310b86724358db7ea68a0af9f8da0d4d899772c2..95182f870c671a8c758e35231df93494464ad889 100644 (file)
--- a/IkiWiki/Plugin/wikitext.pm
+++ b/IkiWiki/Plugin/wikitext.pm
@@ -4,25 +4,16 @@ package IkiWiki::Plugin::wikitext;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

+use IkiWiki;

 use Text::WikiFormat;
 
 sub import { #{{{
 use Text::WikiFormat;
 
 sub import { #{{{

-       IkiWiki::hook(type => "filter", id => "wiki", call => \&filter);
-       IkiWiki::hook(type => "htmlize", id => "wiki", call => \&htmlize);
+       hook(type => "htmlize", id => "wiki", call => \&htmlize);

 } # }}}
 
 } # }}}
 

-sub filter (@) { #{{{
+sub htmlize (@) { #{{{

        my %params=@_;
        my %params=@_;

-
-       # Make CamelCase links work by promoting them to fullfledged
-       # WikiLinks. This regexp is based on the one in Text::WikiFormat.
-       $params{content}=~s#(?<![["/>=])\b((?:[A-Z][a-z0-9]\w*){2,})#[[$1]]#g;
-
-       return $params{content};
-} #}}}
-
-sub htmlize ($) { #{{{
-       my $content = shift;
+       my $content = $params{content};

 
        return Text::WikiFormat::format($content, undef, { implicit_links => 0 });
 } # }}}
 
        return Text::WikiFormat::format($content, undef, { implicit_links => 0 });
 } # }}}