diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-03-21 00:24:06 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-03-21 00:24:06 -0400 |
| commit | 628467125c319b623af0d60dd1e2c5817db3b1d4 (patch) | |
| tree | b026897e8d2fb3806f9d9d3ec38badb552a07b06 | |
| parent | 80b402286c7826f555666e6b8632b78e1d1d564d (diff) | |
Close meta tag for redir properly.
| -rw-r--r-- | IkiWiki/Plugin/meta.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn | 24 |
3 files changed, 10 insertions, 17 deletions
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm index 8a9a5382b..0afe1c362 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); } diff --git a/debian/changelog b/debian/changelog index 5909f237e..ef16cbfaf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -54,6 +54,7 @@ ikiwiki (2.41) UNRELEASED; urgency=low * Time::Duration is no longer used, remove from docs and recommends. * Store userinfo in network byte order for easy portability. (Old files will be automatically converted.) + * Close meta tag for redir properly. -- martin f. krafft <madduck@debian.org> Sun, 02 Mar 2008 17:46:38 +0100 diff --git a/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn b/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn index 4d6506657..fe5366760 100644 --- 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]] --[[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. —[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 |