Merge branch 'prv/po' into pub/po

[ikiwiki.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index ba1847093fce3d5a64aa1ae6508a5726cc6ee5c3..91d2e6082a9291a24ffd17681bb8fc2b00470c2f 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -120,7 +120,7 @@ sub getsetup () { #{{{
        },
        default_plugins => {
                type => "internal",
-               default => [qw{mdwn link inline htmlscrubber passwordauth
+               default => [qw{mdwn link inline meta htmlscrubber passwordauth
                                openid signinedit lockedit conditional
                                recentchanges parentlinks editpage}],
                description => "plugins to enable by default",
@@ -655,19 +655,8 @@ sub newpagefile ($$) { #{{{
 sub targetpage ($$) { #{{{
        my $page=shift;
        my $ext=shift;
-
-       my $targetpage='';
-       run_hooks(targetpage => sub {
-               $targetpage=shift->(
-                       page => $page,
-                       ext => $ext,
-               );
-       });
-
-       if (defined $targetpage && (length($targetpage) > 0)) {
-               return $targetpage;
-       }
-       elsif (! $config{usedirs} || $page eq 'index') {
+       
+       if (! $config{usedirs} || $page eq 'index') {
                return $page.".".$ext;
        }
        else {
@@ -942,10 +931,6 @@ sub beautify_urlpath ($) { #{{{
                $url =~ s!/index.$config{htmlext}$!/!;
        }
 
-       run_hooks(tweakurlpath => sub {
-               $url=shift->(url => $url);
-       });
-
        # Ensure url is not an empty link, and
        # if it's relative, make that explicit to avoid colon confusion.
        if ($url !~ /^\//) {