Created attachment 81184 [details] [review] Bug 21669: Do not html filter TT assignement statements Why? Because we must filter the variables when we display them. If we escape them on assignement, they will be double escaped: [% XXX = "<span>pouet</span>" | html %] [% XXX | html %] => <span>pouet</span> Also it will bring trouble if we are assigning a structure (see bug 21663 for instance).
No test plan here, too many changes. - Eyeball the patch - Are the changes make sense?
Created attachment 81191 [details] [review] Bug 21669: Do not html filter TT assignement statements Why? Because we must filter the variables when we display them. If we escape them on assignement, they will be double escaped: [% XXX = "<span>pouet</span>" | html %] [% XXX | html %] => <span>pouet</span> Also it will bring trouble if we are assigning a structure (see bug 21663 for instance). Signed-off-by: Owen Leonard <oleonard@myacpl.org>
fatal: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt). Repository lacks necessary blobs to fall back on 3-way merge.
Please apply first: Bug 13618: Remove html filter for LAST Bug 21663: Incorrect filter prevents predefined notes from being added to patron acccounts I thought they would have been pushed quickly.
Even with the bugs mentioned I can't get past: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 21669: Do not html filter TT assignement statements error: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt). error: could not build fake ancestor
Created attachment 81289 [details] [review] [PASSED QA] Bug 21669: Do not html filter TT assignement statements Why? Because we must filter the variables when we display them. If we escape them on assignement, they will be double escaped: [% XXX = "<span>pouet</span>" | html %] [% XXX | html %] => <span>pouet</span> Also it will bring trouble if we are assigning a structure (see bug 21663 for instance). Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Awesome work all! Pushed to master for 18.11
Caused by bug 13618 not in 18.05.x series.