diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-06-04 00:15:15 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-06-04 00:15:15 -0400 |
| commit | fab1333b6704f5ccd502a5a108c4899aeaf5f675 (patch) | |
| tree | 9a50935a06cb5805c4101681bff2ae29565d4be3 | |
| parent | 53b188ed35d24933b6440e4c3032ede829eba0ee (diff) | |
Filter hooks are no longer called during the scan phase. This will prevent wikilinks added by filters from being scanned properly. But no known filter hook does that, and calling filters unncessarily during scan slowed down complex filters such as the one used to update the xapian index.
| -rw-r--r-- | IkiWiki/Render.pm | 4 | ||||
| -rw-r--r-- | debian/changelog | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index eb01a4227..3422024d1 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -156,10 +156,6 @@ sub scan ($) { #{{{ my $page=pagename($file); will_render($page, htmlpage($page), 1); - # Always needs to be done, since filters might add links - # to the content. - $content=filter($page, $page, $content); - if ($config{discussion}) { # Discussion links are a special case since they're # not in the text of the page, but on its template. diff --git a/debian/changelog b/debian/changelog index d80f78062..5e833d090 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,11 @@ ikiwiki (2.49) UNRELEASED; urgency=low * inline: The optimisation in 2.41 broke nested inlines. Detect those and avoid overoptimising. * search: Converted to use xapian-omega. + * Filter hooks are no longer called during the scan phase. This will + prevent wikilinks added by filters from being scanned properly. But + no known filter hook does that, and calling filters unncessarily during + scan slowed down complex filters such as the one used to update the xapian + index. -- Joey Hess <joeyh@debian.org> Fri, 30 May 2008 19:08:54 -0400 |