urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote branch 'origin/master'

master
Joey Hess 2010-05-08 19:44:40 -04:00
parent a380fa0e6b 6512423f15
commit 8e50e00d25
1 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn
View File

@ -10,31 +10,33 @@ Otherwise the XML parser chokes.
<http://www.whatwg.org/specs/web-apps/current-work/multipage/text-level-semantics.html#attr-time-pubdate> <http://www.whatwg.org/specs/web-apps/current-work/multipage/text-level-semantics.html#attr-time-pubdate>
(indented exactly 4 spaces)
<pre> <pre>
diff --git a/IkiWiki.pm b/IkiWiki.pm diff --git a/IkiWiki.pm b/IkiWiki.pm
index 1f2ab07..6ab5b56 100644 index 1f2ab07..6ab5b56 100644
--- a/IkiWiki.pm --- a/IkiWiki.pm
+++ b/IkiWiki.pm +++ b/IkiWiki.pm
@@ -1004,7 +1004,7 @@ sub displaytime ($;$$) { @@ -1004,7 +1004,7 @@ sub displaytime ($;$$) {
my $time=formattime($_[0], $_[1]); my $time=formattime($_[0], $_[1]);
if ($config{html5}) { if ($config{html5}) {
return '<time datetime="'.date_3339($_[0]).'"'. return '&lt;time datetime="'.date_3339($_[0]).'"'.
- ($_[2] ? ' pubdate' : ''). - ($_[2] ? ' pubdate' : '').
+ ($_[2] ? ' pubdate="'.date_3339($_[0]).'"' : ''). + ($_[2] ? ' pubdate="'.date_3339($_[0]).'"' : '').
'>'.$time.'</time>'; '>'.$time.'&lt;/time&gt;';
} }
else { else {
diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
index fe8ef09..8c4a1b4 100644 index fe8ef09..8c4a1b4 100644
--- a/IkiWiki/Plugin/relativedate.pm --- a/IkiWiki/Plugin/relativedate.pm
+++ b/IkiWiki/Plugin/relativedate.pm +++ b/IkiWiki/Plugin/relativedate.pm
@@ -59,7 +59,7 @@ sub mydisplaytime ($;$$) { @@ -59,7 +59,7 @@ sub mydisplaytime ($;$$) {
if ($config{html5}) { if ($config{html5}) {
return '<time datetime="'.IkiWiki::date_3339($time).'"'. return '&lt;time datetime="'.IkiWiki::date_3339($time).'"'.
- ($pubdate ? ' pubdate' : '').$mid.'</time>'; - ($pubdate ? ' pubdate' : '').$mid.'&lt;/time&gt;';
+ ($pubdate ? ' pubdate="'.IkiWiki::date_3339($time).'"' : '').$mid.'</time>'; + ($pubdate ? ' pubdate="'.IkiWiki::date_3339($time).'"' : '').$mid.'&lt;/time&gt;';
} }
else { else {
return '<span'.$mid.'</span>'; return '&lt;span'.$mid.'&lt;/span&gt;';
</pre> </pre>