IkiWiki::Plugin::openid: as a precaution, do not call non-coderefs

[git.ikiwiki.info.git] / IkiWiki / Plugin / toggle.pm
diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm

index aae8cdf84beeff62d54197db0e5f1e2733fe5810..af4d2ba3a858774ac6b77be58479fb2a4a18d69c 100644 (file)
--- a/IkiWiki/Plugin/toggle.pm
+++ b/IkiWiki/Plugin/toggle.pm
@@ -20,6 +20,7 @@ sub getsetup () {
                 plugin => {
                         safe => 1,
                         rebuild => undef,
                 plugin => {
                         safe => 1,
                         rebuild => undef,
+                       section => "widget",
                 },
  }
  
                 },
  }
  
@@ -49,8 +50,7 @@ sub preprocess_toggleable (@) {
  
         # Preprocess the text to expand any preprocessor directives
         # embedded inside it.
  
         # Preprocess the text to expand any preprocessor directives
         # embedded inside it.
-       $params{text}=IkiWiki::preprocess($params{page}, $params{destpage}, 
-               IkiWiki::filter($params{page}, $params{destpage}, $params{text}));
+       $params{text}=IkiWiki::preprocess($params{page}, $params{destpage}, $params{text});
         
         my $id=genid($params{page}, $params{id});
         my $class=(lc($params{open}) ne "yes") ? "toggleable" : "toggleable-open";
         
         my $id=genid($params{page}, $params{id});
         my $class=(lc($params{open}) ne "yes") ? "toggleable" : "toggleable-open";
@@ -68,21 +68,20 @@ sub format (@) {
  
         if ($params{content}=~s!(<div class="toggleable(?:-open)?" id="[^"]+">\s*)</div>!$1!g) {
                 $params{content}=~s/<div class="toggleableend">//g;
  
         if ($params{content}=~s!(<div class="toggleable(?:-open)?" id="[^"]+">\s*)</div>!$1!g) {
                 $params{content}=~s/<div class="toggleableend">//g;
-               if (! ($params{content}=~s!^(<body>)!$1.include_javascript($params{page})!em)) {
-                       # no </body> tag, probably in preview mode
-                       $params{content}=include_javascript($params{page}, 1).$params{content};
+               if (! ($params{content}=~s!^(<body[^>]*>)!$1.include_javascript($params{page})!em)) {
+                       # no <body> tag, probably in preview mode
+                       $params{content}=include_javascript(undef).$params{content};
                 }
         }
         return $params{content};
  }
  
                 }
         }
         return $params{content};
  }
  
-sub include_javascript ($;$) {
-       my $page=shift;
-       my $absolute=shift;
+sub include_javascript ($) {
+       my $from=shift;
         
         
-       return '<script src="'.urlto("ikiwiki.js", $page, $absolute).
+       return '<script src="'.urlto("ikiwiki/ikiwiki.js", $from).
                 '" type="text/javascript" charset="utf-8"></script>'."\n".
                 '" type="text/javascript" charset="utf-8"></script>'."\n".
-               '<script src="'.urlto("toggle.js", $page, $absolute).
+               '<script src="'.urlto("ikiwiki/toggle.js", $from).
                 '" type="text/javascript" charset="utf-8"></script>';
  }
  
                 '" type="text/javascript" charset="utf-8"></script>';
  }