htmlscrubber: Also allow some other html5 tags: canvas, progress, meter, ruby, rt...

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

index e5fa8e1a5822983a6be7c53e3645f8ae77eb2be6..7e615f7f1685c32a2586cb3a49abfc67acea6828 100644 (file)
--- a/IkiWiki/Plugin/relativedate.pm
+++ b/IkiWiki/Plugin/relativedate.pm
@@ -4,8 +4,8 @@ package IkiWiki::Plugin::relativedate;
  use warnings;
  no warnings 'redefine';
  use strict;
-use IkiWiki 2.00;
-use POSIX;
+use IkiWiki 3.00;
+use POSIX ();
  use Encode;
  
  sub import {
@@ -26,7 +26,7 @@ sub getsetup () {
  sub format (@) {
          my %params=@_;
  
-       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};
         }
@@ -37,9 +37,9 @@ sub include_javascript ($;$) {
         my $page=shift;
         my $absolute=shift;
         
-       return '<script src="'.urlto("ikiwiki.js", $page, $absolute).
+       return '<script src="'.urlto("ikiwiki/ikiwiki.js", $page, $absolute).
                 '" type="text/javascript" charset="utf-8"></script>'."\n".
-               '<script src="'.urlto("relativedate.js", $page, $absolute).
+               '<script src="'.urlto("ikiwiki/relativedate.js", $page, $absolute).
                 '" type="text/javascript" charset="utf-8"></script>';
  }