Attachment 98401 Details for Bug 23290 – Bug 23290: Allow enabling expand_entities

[patch] Bug 23290: Allow enabling expand_entities

Bug-23290-Allow-enabling-expandentities.patch (text/plain), 1.11 KB, created by Martin Renvoize (ashimema) on 2020-02-04 14:27:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-02-04 14:27:14 UTC

Size: 1.11 KB

patch

obsolete

>From 42cbc7cdb95b19a88edb23addf61c02e0d356a94 Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Fri, 15 Nov 2019 12:41:32 +0000
>Subject: [PATCH] Bug 23290: Allow enabling expand_entities
>
>Since libxml2 disables it now by default, we need to enable it for testing.
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Signed-off-by: David Cook <dcook@prosentient.com.au>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> Koha/XSLT/Security.pm | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/Koha/XSLT/Security.pm b/Koha/XSLT/Security.pm
>index 720c71c7fd..6c75458b02 100644
>--- a/Koha/XSLT/Security.pm
>+++ b/Koha/XSLT/Security.pm
>@@ -144,8 +144,9 @@ sub set_parser_options {
>     my $conf = $self->{_options};
>     return if !$conf;
> 
>-    if( exists $conf->{expand_entities} && $conf->{expand_entities} eq '0' ) {
>-        # we only disable expanding, if we find an explicit 0
>+    if( $conf->{expand_entities} ) {
>+        _set_option($parser, 'expand_entities', 1);
>+    } else {
>         _set_option($parser, 'expand_entities', 0);
>     }
> }
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 23290: 91435 | 91437 | 95450 | 95451 | 95452 | 95453 | 95454 | 95475 | 95478 | 95480 | 95481 | 95482 | 95483 | 95484 | 95485 | 95551 | 96299 | 96300 | 96301 | 96302 | 96303 | 96304 | 97606 | 97607 | 97608 | 97609 | 97610 | 97611 | 97612 | 97613 | 97614 | 97615 | 97616 | 97617 | 97618 | 97619 | 97620 | 97871 | 97978 | 97980 | 98397 | 98398 | 98399 | 98400 | 98401 | 98402 | 98403 | 98404 | 98405 | 98406 | 99587