Merge branch 'master' into templatemove

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

index aae8cdf84beeff62d54197db0e5f1e2733fe5810..f9c89954044e30aefbd5627773e5886fb0941e2d 100644 (file)
--- a/IkiWiki/Plugin/toggle.pm
+++ b/IkiWiki/Plugin/toggle.pm
@@ -20,6 +20,7 @@ sub getsetup () {
                 plugin => {
                         safe => 1,
                         rebuild => undef,
+                       section => "widget",
                 },
  }
  
@@ -68,7 +69,7 @@ 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!^(<body>)!$1.include_javascript($params{page})!em)) {
+               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};
                 }