diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-03-19 15:15:30 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-03-19 15:15:30 -0400 |
| commit | d8c4ea783be95b0ec0f4c69a4a1f230ac0e43601 (patch) | |
| tree | 738c81383a22090d72a074ec5511761f9ef83926 | |
| parent | f003e97d10e42ea97b4a03fd62a296fe993a9677 (diff) | |
| parent | 4f6728a68536f5ea70d3e7b45e56bac099f7ed4f (diff) | |
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
| -rw-r--r-- | doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn | 25 | ||||
| -rw-r--r-- | doc/ikiwikiusers.mdwn | 2 |
2 files changed, 26 insertions, 1 deletions
diff --git a/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn b/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn index d53a07a4d..302d7b605 100644 --- a/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn +++ b/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn @@ -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]] diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 6d828ce00..060083607 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -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 |