Filter hooks are no longer called during the scan phase. This will prevent wikilinks...

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index eb01a422764b8236a88f8443165e36e753f0b922..3422024d1e1c6d09ca701082c91ffa92b25d9a8d 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -156,10 +156,6 @@ sub scan ($) { #{{{
                my $page=pagename($file);
                will_render($page, htmlpage($page), 1);
 
                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.
                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 d80f780624dd0c7dd34d531c83dd2b818c11ac32..5e833d09098276d7f210ff3dddc6fddb3af8d67e 100644 (file)
--- 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.
   * 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
 
 
  -- Joey Hess <joeyh@debian.org>  Fri, 30 May 2008 19:08:54 -0400