diff options
| author | Joey Hess <joey@kitenet.net> | 2010-11-29 14:43:57 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-11-29 14:43:57 -0400 |
| commit | 0ae1e4cc0e598eacfeb508d11db81c33169631fd (patch) | |
| tree | f779fd1bd4b4eaae315473ea70f9c1e85a7981d1 /IkiWiki/Plugin/relativedate.pm | |
| parent | b3f7c6a9a579208f555a9ae7a409474d68897d04 (diff) | |
| parent | 18bb93f5744c1b57b929d9f8a6042e51fc5256f0 (diff) | |
Merge remote branch 'smcv/ready/localurl'
Diffstat (limited to 'IkiWiki/Plugin/relativedate.pm')
| -rw-r--r-- | IkiWiki/Plugin/relativedate.pm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm index 7296889ab..4ae0be861 100644 --- a/IkiWiki/Plugin/relativedate.pm +++ b/IkiWiki/Plugin/relativedate.pm @@ -28,18 +28,17 @@ sub format (@) { 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}; + $params{content}=include_javascript(undef).$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". - '<script src="'.urlto("ikiwiki/relativedate.js", $page, $absolute). + '<script src="'.urlto("ikiwiki/relativedate.js", $from). '" type="text/javascript" charset="utf-8"></script>'; } |