]> sipb.mit.edu Git - ikiwiki.git/blobdiff - IkiWiki/Plugin/toggle.pm
update
[ikiwiki.git] / IkiWiki / Plugin / toggle.pm
index 9e1afc08dbfa737ac5f29f079a14b1deb54d6cb7..7318731c54808c01ee73ec4b8b660708bb8a066a 100644 (file)
@@ -58,7 +58,7 @@ sub import { #{{{
        hook(type => "preprocess", id => "toggle",
                call => \&preprocess_toggle);
        hook(type => "preprocess", id => "toggleable",
        hook(type => "preprocess", id => "toggle",
                call => \&preprocess_toggle);
        hook(type => "preprocess", id => "toggleable",
-               call => \&preprocess_toggleable, scan => 1);
+               call => \&preprocess_toggleable);
        hook(type => "format", id => "toggle", call => \&format);
 } # }}}
 
        hook(type => "format", id => "toggle", call => \&format);
 } # }}}
 
@@ -87,9 +87,9 @@ sub preprocess_toggleable (@) { #{{{
        my %params=(id => "default", text => "", @_);
 
        # Preprocess the text to expand any preprocessor directives
        my %params=(id => "default", text => "", @_);
 
        # Preprocess the text to expand any preprocessor directives
-       # embedded inside it. This is why scan is set for this preprocessor
-       # directive, since it could expand to something with a link in it.
-       $params{text}=IkiWiki::preprocess($params{page}, $params{destpage}, $params{text});
+       # embedded inside it.
+       $params{text}=IkiWiki::preprocess($params{page}, $params{destpage}, 
+               IkiWiki::filter($params{page}, $params{text}));
        
        my $id=genid($params{page}, $params{id});
 
        
        my $id=genid($params{page}, $params{id});