WordPress 3.9.2

[autoinstalls/wordpress.git] / wp-includes / ID3 / getid3.lib.php

diff --git a/wp-includes/ID3/getid3.lib.php b/wp-includes/ID3/getid3.lib.php
index f8df2334865b1857115a383bbb653855164ed8fa..a7282c77c0652634ca52c123b14a054e018a9cab 100644 (file)
--- a/wp-includes/ID3/getid3.lib.php
+++ b/wp-includes/ID3/getid3.lib.php
@@ -519,11 +519,12 @@ class getid3_lib
        }
 
        public static function XML2array($XMLstring) {
-               if (function_exists('simplexml_load_string')) {
-                       if (function_exists('get_object_vars')) {
-                               $XMLobject = simplexml_load_string($XMLstring);
-                               return self::SimpleXMLelement2array($XMLobject);
-                       }
+               if ( function_exists( 'simplexml_load_string' ) && function_exists( 'libxml_disable_entity_loader' ) ) {
+                       $loader = libxml_disable_entity_loader( true );
+                       $XMLobject = simplexml_load_string( $XMLstring, 'SimpleXMLElement', LIBXML_NOENT );
+                       $return = self::SimpleXMLelement2array( $XMLobject );
+                       libxml_disable_entity_loader( $loader );
+                       return $return;
                }
                return false;
        }