diff options
author | intrigeri <intrigeri@boum.org> | 2010-07-11 10:46:18 +0200 |
---|---|---|
committer | intrigeri <intrigeri@boum.org> | 2010-07-11 10:46:18 +0200 |
commit | c99d26030e6ddd7a21932e98e40a8df7d896886d (patch) | |
tree | 26056e3e2a5c7c81ebe7baf243a0bb4ae765e76e /doc/bugs/po_vs_templates.mdwn | |
parent | c9b1a4dd7d826b5e8e2d0a757ba5ecbba8d832b2 (diff) | |
parent | 1bb9157f2ab94b8306e1e2fb1a5b3ac9bbfe5772 (diff) |
Merge remote branch 'upstream/master' into prv/po
Conflicts:
IkiWiki/Plugin/po.pm
doc/plugins/po.mdwn
Diffstat (limited to 'doc/bugs/po_vs_templates.mdwn')
-rw-r--r-- | doc/bugs/po_vs_templates.mdwn | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/doc/bugs/po_vs_templates.mdwn b/doc/bugs/po_vs_templates.mdwn index a0ccc5f53..7bc56676e 100644 --- a/doc/bugs/po_vs_templates.mdwn +++ b/doc/bugs/po_vs_templates.mdwn @@ -12,6 +12,32 @@ generated HTML. This has been fixed in my po branch. +> My commit dcd57dd5c9f3265bb7a78a5696b90976698c43aa updates the +> bugfix in a much more elegant manner. Its main disadvantage is to +> add an (optional) argument to IkiWiki::filter. Please review. + -- [[intrigeri]] +>> Hmm. Don't like adding a fourth positional parameter to that (or +>> any really) function. +>> +>> I think it's quite possible that some of the directives that are +>> calling filter do so unnecessarily. For example, conditional, +>> cutpaste, more, and toggle each re-filter text that comes from the +>> page and so has already been filtered. They could probably drop +>> the filtering. template likewise does not need to filter the +>> parameters passed into it. Does it need to filter the template output? +>> Well, it allows the (deprecated) embed plugin to work on template +>> content, but that's about it. +>> +>> Note also that the only other plugin to provide a filter, txt, +>> could also run into similar problems as po has, in theory (it looks at +>> the page parameter and assumes the content is for the whole page). +>> +>> [[!template id=gitbranch branch=origin/filter-full author="[[joey]]"]] +>> So, I've made a filter-full branch, where I attempt to fix this +>> by avoiding unnecessary filtering. Can you check it and merge it into +>> your po branch and remove your other workarounds so I can merge? +>> --[[Joey]] + [[!tag patch]] |