diff options
Diffstat (limited to 'IkiWiki')
| -rw-r--r-- | IkiWiki/CGI.pm | 2 | ||||
| -rw-r--r-- | IkiWiki/Plugin/inline.pm | 2 | ||||
| -rw-r--r-- | IkiWiki/Plugin/meta.pm | 2 | ||||
| -rw-r--r-- | IkiWiki/Plugin/search.pm | 4 | ||||
| -rw-r--r-- | IkiWiki/Plugin/sidebar.pm | 2 | ||||
| -rw-r--r-- | IkiWiki/Plugin/table.pm | 2 | ||||
| -rw-r--r-- | IkiWiki/Plugin/template.pm | 2 | ||||
| -rw-r--r-- | IkiWiki/Render.pm | 4 |
8 files changed, 10 insertions, 10 deletions
diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index 532f9c5f6..8a294e887 100644 --- a/IkiWiki/CGI.pm +++ b/IkiWiki/CGI.pm @@ -397,7 +397,7 @@ sub cgi_editpage ($$) { #{{{ ); }); $form->tmpl_param("page_preview", - htmlize($page, $type, + htmlize($page, $page, $type, linkify($page, $page, preprocess($page, $page, filter($page, $page, $content), 0, 1)))); diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 7d81e9182..344620ebe 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -352,7 +352,7 @@ sub get_inline_content ($$) { #{{{ my $type=pagetype($file); if (defined $type) { $nested++; - my $ret=htmlize($page, $type, + my $ret=htmlize($page, $destpage, $type, linkify($page, $destpage, preprocess($page, $destpage, filter($page, $destpage, diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm index 0afe1c362..e2914a78a 100644 --- a/IkiWiki/Plugin/meta.pm +++ b/IkiWiki/Plugin/meta.pm @@ -53,7 +53,7 @@ sub htmlize ($$$) { #{{{ my $page = shift; my $destpage = shift; - return IkiWiki::htmlize($page, pagetype($pagesources{$page}), + return IkiWiki::htmlize($page, $destpage, pagetype($pagesources{$page}), IkiWiki::linkify($page, $destpage, IkiWiki::preprocess($page, $destpage, shift))); } diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm index 3dc70f0b7..aa0a8085e 100644 --- a/IkiWiki/Plugin/search.pm +++ b/IkiWiki/Plugin/search.pm @@ -57,7 +57,7 @@ my $scrubber; sub index (@) { #{{{ my %params=@_; - return $params{content} if %IkiWiki::preprocessing; + return $params{content} if $IkiWiki::preprocessing{$params{destpage}}; my $db=xapiandb(); my $doc=Search::Xapian::Document->new(); @@ -70,7 +70,7 @@ sub index (@) { #{{{ $title=IkiWiki::pagetitle($params{page}); } - # Remove any html from text to be indexed. + # Remove html from text to be indexed. if (! defined $scrubber) { eval q{use HTML::Scrubber}; if (! $@) { diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm index a49726768..7c2e6e1f6 100644 --- a/IkiWiki/Plugin/sidebar.pm +++ b/IkiWiki/Plugin/sidebar.pm @@ -27,7 +27,7 @@ sub sidebar_content ($) { #{{{ my $content=readfile(srcfile($sidebar_file)); return unless length $content; - return IkiWiki::htmlize($page, $sidebar_type, + return IkiWiki::htmlize($sidebar_page, $page, $sidebar_type, IkiWiki::linkify($sidebar_page, $page, IkiWiki::preprocess($sidebar_page, $page, IkiWiki::filter($sidebar_page, $page, $content)))); diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm index 20c71e1c7..11474c8f0 100644 --- a/IkiWiki/Plugin/table.pm +++ b/IkiWiki/Plugin/table.pm @@ -175,7 +175,7 @@ sub htmlize ($$$) { #{{{ my $page = shift; my $destpage = shift; - return IkiWiki::htmlize($page, pagetype($pagesources{$page}), + return IkiWiki::htmlize($page, $destpage, pagetype($pagesources{$page}), IkiWiki::preprocess($page, $destpage, shift)); } diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm index 416762fe1..a6e34fcc9 100644 --- a/IkiWiki/Plugin/template.pm +++ b/IkiWiki/Plugin/template.pm @@ -48,7 +48,7 @@ sub preprocess (@) { #{{{ foreach my $param (keys %params) { if ($template->query(name => $param)) { $template->param($param => - IkiWiki::htmlize($params{page}, + IkiWiki::htmlize($params{page}, $params{destpage}, pagetype($pagesources{$params{page}}), $params{$param})); } diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 3422024d1..272eb239a 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -191,7 +191,7 @@ sub render ($) { #{{{ will_render($page, htmlpage($page), 1); return if $type=~/^_/; - my $content=htmlize($page, $type, + my $content=htmlize($page, $page, $type, linkify($page, $page, preprocess($page, $page, filter($page, $page, @@ -520,7 +520,7 @@ sub commandline_render () { #{{{ $content=filter($page, $page, $content); $content=preprocess($page, $page, $content); $content=linkify($page, $page, $content); - $content=htmlize($page, $type, $content); + $content=htmlize($page, $page, $type, $content); $pagemtime{$page}=(stat($srcfile))[9]; print genpage($page, $content); |