Revert "added hook urlpath" and "rename urlpath hook into tweakurlpath..."

This reverts commits d9b9022c13af3aa6c469df05beaa293fcf33cafc and
39d44d443d2271ec8787e6192b8b5811bee41ebf. This functionality should now be
achieved using the new inject() function.

Signed-off-by: intrigeri <intrigeri@boum.org>

diff --git a/IkiWiki.pm b/IkiWiki.pm
index ba1847093fce3d5a64aa1ae6508a5726cc6ee5c3..8b3a911143934b0fe6acf674edf6b18e2bbc84d1 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -942,10 +942,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 !~ /^\//) {

diff --git a/IkiWiki/Plugin/skeleton.pm.example b/IkiWiki/Plugin/skeleton.pm.example
index ecf2a2407ca135d91503b4ebe3ed27d7bebf89f3..af22b340659bd72067c1cd552e69c221dd7ab364 100644 (file)
--- a/IkiWiki/Plugin/skeleton.pm.example
+++ b/IkiWiki/Plugin/skeleton.pm.example
@@ -35,7 +35,6 @@ sub import { #{{{
        hook(type => "formbuilder", id => "skeleton", call => \&formbuilder);
        hook(type => "savestate", id => "skeleton", call => \&savestate);
        hook(type => "targetpage", id => "skeleton", call => \&targetpage);
-       hook(type => "urlpath", id => "skeleton", call => \&urlpath);
 } # }}}
 
 sub getopt () { #{{{
@@ -210,8 +209,4 @@ sub targetpage () { #{{{
        debug("skeleton plugin running in targetpage");
 } #}}}
 
-sub urlpath () { #{{{
-       debug("skeleton plugin running in urlpath");
-} #}}}
-
 1

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 82b377820c248ec946237529caf6c5f792469c38..e8ac9614b4335cd6203853473e289c2c1b8a5115 100644 (file)
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -436,16 +436,6 @@ be compiled into.
 
 It should return the target filename.
 
-### tweakurlpath
-
-       hook(type => "tweakurlpath", id => "foo", call => \&tweakurlpath);
-
-This hook can be used to modify the internal urls generated by
-ikiwiki; it is run just after ikiwiki has removed the trailing
-`index.html`, in case `usedirs` is enabled.
-
-It should return the modified url.
-
 ## Plugin interface
 
 To import the ikiwiki plugin interface: