merged po4a robustness workaround

diff --git a/debian/changelog b/debian/changelog
index fd23ccd8c26e05fca29954d7c5289c973845ff20..feb4cff8199e45d6044d5ff0f6a1eb199855afde 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ ikiwiki (3.20110431) UNRELEASED; urgency=low
   * Changed license of madduck's python plugins from GPL-2 to BSD-2-clause.
   * po: support language codes in the form of 'es_AR', and 'arn'. (intrigeri)
     Closes: #627844
+  * po: Make po4a warn, not error on a malformed document. (intrigeri)
 
  -- Joey Hess <joeyh@debian.org>  Thu, 05 May 2011 13:02:19 -0400
 

diff --git a/doc/bugs/po:_po4a_too_strict_on_html_pages.mdwn b/doc/bugs/po:_po4a_too_strict_on_html_pages.mdwn
index 20584e4f4f6798a539a993968f583e916c23cf3d..eba59a682e9c988dd37df7d231ca9acd05f6c96c 100644 (file)
--- a/doc/bugs/po:_po4a_too_strict_on_html_pages.mdwn
+++ b/doc/bugs/po:_po4a_too_strict_on_html_pages.mdwn
@@ -14,3 +14,9 @@ given ikiwiki site build (DoS) when both the html and po plugins are
 enabled: inserting a html tag without closing it is enough.
 
 --[[intrigeri]]
+
+> Hmm, so this happened while I was away at the beach and I have a big
+> backlog of stuff, only saw it now. I've merged the match for master and
+> will be releasing that soon. I will cherry-pick the fix into at least
+> my debian-stable branch too. I don't know if this is worth doing a whole
+> security advisory for. --[[Joey]]