Merge commit 'origin/master'

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 90fedca4f5dfb5614c229be58f453ea83307ea28..bab7b707aa6c485338fb3b863760e8019cd65e1c 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -655,19 +655,8 @@ sub newpagefile ($$) { #{{{
 sub targetpage ($$) { #{{{
        my $page=shift;
        my $ext=shift;
 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 {
                return $page.".".$ext;
        }
        else {


@@ -815,7 +804,6 @@ sub will_render ($$;$) { #{{{
 sub bestlink ($$) { #{{{
        my $page=shift;
        my $link=shift;
 sub bestlink ($$) { #{{{
        my $page=shift;
        my $link=shift;

-       my $res=undef;

        
        my $cwd=$page;
        if ($link=~s/^\/+//) {
        
        my $cwd=$page;
        if ($link=~s/^\/+//) {


@@ -830,35 +818,25 @@ sub bestlink ($$) { #{{{
                $l.=$link;
 
                if (exists $links{$l}) {
                $l.=$link;
 
                if (exists $links{$l}) {

-                       $res=$l;
+                       return $l;

                }
                elsif (exists $pagecase{lc $l}) {
                }
                elsif (exists $pagecase{lc $l}) {

-                       $res=$pagecase{lc $l};
+                       return $pagecase{lc $l};

                }
                }

-       } while ($cwd=~s{/?[^/]+$}{} && ! defined $res);
+       } while $cwd=~s{/?[^/]+$}{};

 
 

-       if (! defined $res && length $config{userdir}) {
+       if (length $config{userdir}) {

                my $l = "$config{userdir}/".lc($link);
                if (exists $links{$l}) {
                my $l = "$config{userdir}/".lc($link);
                if (exists $links{$l}) {

-                       $res=$l;
+                       return $l;

                }
                elsif (exists $pagecase{lc $l}) {
                }
                elsif (exists $pagecase{lc $l}) {

-                       $res=$pagecase{lc $l};
+                       return $pagecase{lc $l};

                }
        }
 
                }
        }
 

-       if (defined $res) {
-               run_hooks(tweakbestlink => sub {
-                       $res=shift->(
-                               page => $page,
-                               link => $res);
-               });
-               return $res;
-       }
-       else {
-               #print STDERR "warning: page $page, broken link: $link\n";
-               return "";
-       }
+       #print STDERR "warning: page $page, broken link: $link\n";
+       return "";

 } #}}}
 
 sub isinlinableimage ($) { #{{{
 } #}}}
 
 sub isinlinableimage ($) { #{{{


@@ -953,10 +931,6 @@ sub beautify_urlpath ($) { #{{{
                $url =~ s!/index.$config{htmlext}$!/!;
        }
 
                $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 !~ /^\//) {
        # Ensure url is not an empty link, and
        # if it's relative, make that explicit to avoid colon confusion.
        if ($url !~ /^\//) {