Merge commit 'upstream/master'

[git.ikiwiki.info.git] / doc / bugs / RecentChanges_contains_invalid_XHTML.mdwn

diff --git a/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn b/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn
index 4d65066570245d35a73b5834f9a2cdac9f9f418c..aeeb9e21bae73ab8d8e0103fcf0bde35878a5753 100644 (file)
--- a/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn
+++ b/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn
@@ -4,11 +4,17 @@ the end of the [[RecentChanges]] page
 
     <p></div></p>
 
+> I'll bet this is fixed if you use the markdown 1.2 prerelease, which has
+> a much less buggy html parser. (Ah, I see below that was the case.) 
+> --[[Joey]]
+
 Also, there is a problem with the `<img>` tags generated by the smiley
 plugin which end up wrapped in a `<pre>` tag in the inline diff output.
 `<img>` tags is not allowed within a `<pre>` block.  Maybe the smiley
 plugin should be disabled on [[RecentChanges]]?
 
+> See [[Smileys_in_the_block_code]], which is now fixed. --[[Joey]]
+
 See the [validator output][validate] for more details.
 
  [tmpl]: http://git.ikiwiki.info/?p=ikiwiki;a=blob_plain;f=templates/recentchanges.tmpl;hb=HEAD
@@ -31,24 +37,10 @@ processing and throw an error. &mdash;[Jason Blevins](http://jblevins.org/)
 Here is a simple patch for the refresh problem.  I haven't figured out
 what's causing the recentchanges bug yet.
 
-
-    diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
-    index 8a9a538..0afe1c3 100644
-    --- a/IkiWiki/Plugin/meta.pm
-    +++ b/IkiWiki/Plugin/meta.pm
-    @@ -186,7 +186,7 @@ sub preprocess (@) { #{{{
-                       $value=encode_entities($value);
-               }
-               my $delay=int(exists $params{delay} ? $params{delay} : 0);
-    -          my $redir="<meta http-equiv=\"refresh\" content=\"$delay; URL=$value\">";
-    +          my $redir="<meta http-equiv=\"refresh\" content=\"$delay; URL=$value\" />";
-               if (! $safe) {
-                       $redir=scrub($redir);
-               }
-
-
 --[[JasonBlevins]]
 
+> Thanks, applied that patch. --[[Joey]]
+
 - - -
 
 It turns out that the invalid XHTML on the recent changes page is due to
@@ -59,4 +51,6 @@ after installing the most recent version of Text::Markdown from CPAN.
 Note that the above patch for the redirect tag is still applicable and
 the smiley issue remains open. --[[JasonBlevins]]
 
-[[tag patch]]
+> This bug is [[done]], all issues are fixed. --[[Joey]]
+
+[[!tag patch]]