cherry-pick uri security fix

[git.ikiwiki.info.git] / IkiWiki / Plugin / toggle.pm

diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm
index 4a16ef32c70db4c7f188e8790be78e285cfdf55e..df5a2a7373290026a11910b97b94a291f24eed5c 100644 (file)
--- a/IkiWiki/Plugin/toggle.pm
+++ b/IkiWiki/Plugin/toggle.pm
@@ -80,7 +80,13 @@ sub preprocess_toggle (@) { #{{{
        my %params=(id => "default", text => "more", @_);
 
        my $id=genid($params{page}, $params{id});
        my %params=(id => "default", text => "more", @_);
 
        my $id=genid($params{page}, $params{id});

-       return "<a class=\"toggle\" href=\"#$id\">$params{text}</a>";
+       if (! $params{preview}) {
+               return "<a class=\"toggle\" href=\"#$id\">$params{text}</a>";
+       }
+       else {
+               return "$params{text} ".
+                       gettext("(not toggleable in preview mode)");
+       }

 } # }}}
 
 sub preprocess_toggleable (@) { #{{{
 } # }}}
 
 sub preprocess_toggleable (@) { #{{{


@@ -89,7 +95,7 @@ sub preprocess_toggleable (@) { #{{{
        # Preprocess the text to expand any preprocessor directives
        # embedded inside it.
        $params{text}=IkiWiki::preprocess($params{page}, $params{destpage}, 
        # Preprocess the text to expand any preprocessor directives
        # embedded inside it.
        $params{text}=IkiWiki::preprocess($params{page}, $params{destpage}, 

-               IkiWiki::filter($params{page}, $params{text}));
+               IkiWiki::filter($params{page}, $params{destpage}, $params{text}));

        
        my $id=genid($params{page}, $params{id});
 
        
        my $id=genid($params{page}, $params{id});