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>

diff --git a/Koha/XSLT/Security.pm b/Koha/XSLT/Security.pm
index 720c71c..6c75458 100644 (file)
--- 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);
     }
 }