aboutsummaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2018-12-01 21:18:23 +0000
committerSimon McVittie <smcv@debian.org>2019-02-24 17:23:34 +0000
commit824cf7db1b96a16b080e284bc3ebf90c1f14a203 (patch)
tree2362c20b87d5d434ce6e4e8c3790f5c795299693 /CHANGELOG
parent94486851176765d5fac2992256039647605976f3 (diff)
downloadikiwiki-824cf7db1b96a16b080e284bc3ebf90c1f14a203.tar
ikiwiki-824cf7db1b96a16b080e284bc3ebf90c1f14a203.tar.gz
po: Always filter .po files
The input to filter hooks is meant to be the content of a source file on disk. If we only filter once per (page, destpage) pair, and a page is inlined into the same destpage more than once, then the second occurrence will render as the result of htmlizing .po source as if it was Markdown (or whatever the type of the corresponding master page is), which is never going to end well. The alreadyfiltered mechanism was added in commit 1e874b3f to avoid preprocessing loops, but I'm not sure where it could lead to a loop: filter hooks are only called from IkiWiki::filter, which is only called on page content from disk or on proposed content being previewed. According to <https://bugs.debian.org/911356#41>, deleting the alreadyfiltered mechanism resolves the problem, as well as simplifying the code. Closes: #911356 Tested-by: intrigeri
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG15
1 files changed, 15 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index ad37e72e8..5237ee7b8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,18 @@
+ikiwiki (3.20190208) UNRELEASED; urgency=medium
+
+ * po: Always filter .po files.
+ The po plugin in previous ikiwiki releases made the second and
+ subsequent filter call per (page, destpage) pair into a no-op,
+ apparently in an attempt to prevent *recursive* filtering (which as
+ far as we can tell can't happen anyway), with the undesired effect
+ of interpreting the raw .po file as page content (e.g. Markdown)
+ if it was inlined into the same page twice, which is apparently
+ something that tails.org does. Simplify this by deleting the code
+ that prevented repeated filtering. Thanks, intrigeri
+ (Closes: #911356)
+
+ -- Simon McVittie <smcv@debian.org> Sun, 24 Feb 2019 17:11:39 +0000
+
ikiwiki (3.20190207) upstream; urgency=medium
[ Amitai Schleier ]