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

diff --git a/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn b/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn
index d53a07a4da56b80a94ff1d022c96c98617c103a4..302d7b60562cb4302548bed354a48d1ebd740b3e 100644 (file)
--- 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 6d828ce004274b25e31e0d75a97a09d353f62346..060083607218f7eae12804ac631c589352bcca74 100644 (file)
--- 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