(no commit message)

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

index 7296889ab28f21c9c642e468d503dc502428ede7..083966ad2fc346c98fd24ed76af622471ff1d852 100644 (file)
--- a/IkiWiki/Plugin/relativedate.pm
+++ b/IkiWiki/Plugin/relativedate.pm
@@ -26,20 +26,19 @@ sub getsetup () {
  sub format (@) {
          my %params=@_;
  
  sub format (@) {
          my %params=@_;
  
-       if (! ($params{content}=~s!^(<body[^>]*>)!$1.include_javascript($params{page})!em)) {
+       if (! ($params{content}=~s!^(\s*</body[^>]*>)!include_javascript($params{page}).$1!em)) {
                 # no <body> tag, probably in preview mode
                 # no <body> tag, probably in preview mode
-               $params{content}=include_javascript($params{page}, 1).$params{content};
+               $params{content}=$params{content}.include_javascript(undef);
         }
         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/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("ikiwiki/relativedate.js", $page, $absolute).
+               '<script src="'.urlto("ikiwiki/relativedate.js", $from).
                 '" type="text/javascript" charset="utf-8"></script>';
  }
  
                 '" type="text/javascript" charset="utf-8"></script>';
  }