summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2008-11-02 18:08:50 +0100
committerintrigeri <intrigeri@boum.org>2008-11-02 18:08:50 +0100
commit7c173aca3e87d13fdd044cb79dac80ad83d64a38 (patch)
treeab55371334e64f255bc0d7bec406e1a16cd0e408
parentc696239b6b1ce6b3a3ee20cc88eb5fcb48c0bb7d (diff)
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>
-rw-r--r--IkiWiki.pm4
-rw-r--r--IkiWiki/Plugin/skeleton.pm.example5
-rw-r--r--doc/plugins/write.mdwn10
3 files changed, 0 insertions, 19 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm
index ba1847093..8b3a91114 100644
--- 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 ecf2a2407..af22b3406 100644
--- 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 82b377820..e8ac9614b 100644
--- 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: