diff options
author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-05-17 19:55:11 +0000 |
---|---|---|
committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-05-17 19:55:11 +0000 |
commit | cf35ee04cddd7b9b39636499dd24b689443c0e97 (patch) | |
tree | c5b052a1edf1228f786bfc65229ae634f3c4b1c0 /IkiWiki/Render.pm | |
parent | fca6ab6def2536a6566fe3ddca2c069397f856b1 (diff) |
* Add a destpage parameter to the filter hook.
* Fix links to smilies generated by the smiley plugin for inlined pages. The
old links were often wrong, but often still worked by accident.
Diffstat (limited to 'IkiWiki/Render.pm')
-rw-r--r-- | IkiWiki/Render.pm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 92993fd95..ef4d11235 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -159,7 +159,7 @@ sub scan ($) { #{{{ # Always needs to be done, since filters might add links # to the content. - $content=filter($page, $content); + $content=filter($page, $page, $content); my @links; while ($content =~ /(?<!\\)$config{wiki_link_regexp}/g) { @@ -186,15 +186,15 @@ sub render ($) { #{{{ my $type=pagetype($file); my $srcfile=srcfile($file); if (defined $type) { - my $content=readfile($srcfile); my $page=pagename($file); delete $depends{$page}; will_render($page, htmlpage($page), 1); - $content=filter($page, $content); - $content=preprocess($page, $page, $content); - $content=linkify($page, $page, $content); - $content=htmlize($page, $type, $content); + my $content=htmlize($page, $type, + linkify($page, $page, + preprocess($page, $page, + filter($page, $page, + readfile($srcfile))))); writefile(htmlpage($page), $config{destdir}, genpage($page, $content, mtime($srcfile))); @@ -454,7 +454,7 @@ sub commandline_render () { #{{{ my $content=readfile($srcfile); my $page=pagename($file); $pagesources{$page}=$file; - $content=filter($page, $content); + $content=filter($page, $page, $content); $content=preprocess($page, $page, $content); $content=linkify($page, $page, $content); $content=htmlize($page, $type, $content); |