Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info

master
Joey Hess 2008-03-19 15:15:30 -04:00
commit d8c4ea783b
2 changed files with 26 additions and 1 deletions

View File

@ -25,3 +25,28 @@ I'm noticing these problems because I'm serving ikiwiki-generated
content as `application/xhtml+xml` (as opposed to `text/html`) in order
to include inline MathML. Any invalid XHTML causes Firefox to halt all
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]]
[[tag patch]]

View File

@ -37,7 +37,7 @@ Personal sites and blogs
* [[Joey]]'s [homepage](http://kitenet.net/~joey/), including his weblog
* [Kyle's MacLea Genealogy wiki](http://kitenet.net/~kyle/family/wiki) and [Livingstone and MacLea Emigration Registry](http://kitenet.net/~kyle/family/registry)
* [Ulrik's small collection of small apps](http://www.student.lu.se/~cif04usv/wiki/)
* [Ulrik's personal web page](http://users.student.lth.se/f04us/wiki/)
* [kite](http://kitenet.net)
* [Paul Collins's as-yet purposeless wiki](http://wiki.ondioline.org/)
* [Andre Luis Lopes's personal website](http://www.andrelop.org/). Brazilian Portuguese only