diff options
author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-05-26 08:24:36 +0000 |
---|---|---|
committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-05-26 08:24:36 +0000 |
commit | 282893be819eab14f3a2078f1741ec9c9ed363b1 (patch) | |
tree | cd9977f7ff30063dafd2dcb043f6507e6dd17790 /IkiWiki/Render.pm | |
parent | 03c98d3c79370157d94deef588415e778ab6ca87 (diff) | |
download | ikiwiki-282893be819eab14f3a2078f1741ec9c9ed363b1.tar ikiwiki-282893be819eab14f3a2078f1741ec9c9ed363b1.tar.gz |
* Rebuilding on upgrade to this version is recommended.
* Add a html validity check to the test suite, using the wdg-html-validator,
if available.
* Make the html valid when there is nothing in the actions list by adding an
empty <li> to the end of it.
* Reordered some function call parameters for consistency.
Diffstat (limited to 'IkiWiki/Render.pm')
-rw-r--r-- | IkiWiki/Render.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index b59a721c0..5bc7f6ebb 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -8,8 +8,8 @@ use File::Spec; use IkiWiki; sub linkify ($$) { #{{{ - my $content=shift; my $page=shift; + my $content=shift; $content =~ s{(\\?)$config{wiki_link_regexp}}{ $2 ? ( $1 ? "[[$2|$3]]" : htmllink($page, titlepage($3), 0, 0, pagetitle($2))) @@ -152,8 +152,8 @@ sub globlist_merge ($$) { #{{{ } #}}} sub genpage ($$$) { #{{{ - my $content=shift; my $page=shift; + my $content=shift; my $mtime=shift; my $title=pagetitle(basename($page)); @@ -218,8 +218,8 @@ sub mtime ($) { #{{{ } #}}} sub findlinks ($$) { #{{{ - my $content=shift; my $page=shift; + my $content=shift; my @links; while ($content =~ /(?<!\\)$config{wiki_link_regexp}/g) { @@ -254,15 +254,15 @@ sub render ($) { #{{{ } } - $links{$page}=[findlinks($content, $page)]; + $links{$page}=[findlinks($page, $content)]; - $content=linkify($content, $page); + $content=linkify($page, $content); $content=preprocess($page, $content); $content=htmlize($type, $content); check_overwrite("$config{destdir}/".htmlpage($page), $page); writefile(htmlpage($page), $config{destdir}, - genpage($content, $page, mtime($srcfile))); + genpage($page, $content, mtime($srcfile))); $oldpagemtime{$page}=time; $renderedfiles{$page}=htmlpage($page); } |