From ac930e0e5f9134a008bc2c2a773a3b0d5c50fabb Mon Sep 17 00:00:00 2001
From: desrosj <desrosj@git.wordpress.org>
Date: Wed, 14 Apr 2021 23:10:04 +0000
Subject: [PATCH] External libraries: Include upstream GetID3 fix for PHP 8.

Props jrf, xknown.
Built from https://develop.svn.wordpress.org/trunk@50714


git-svn-id: http://core.svn.wordpress.org/trunk@50323 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/ID3/getid3.lib.php | 16 ++++++----------
 wp-includes/version.php        |  2 +-
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/wp-includes/ID3/getid3.lib.php b/wp-includes/ID3/getid3.lib.php
index 3a5983fc26..8514e9781f 100644
--- a/wp-includes/ID3/getid3.lib.php
+++ b/wp-includes/ID3/getid3.lib.php
@@ -720,18 +720,14 @@ class getid3_lib
 	 */
 	public static function XML2array($XMLstring) {
 		if (function_exists('simplexml_load_string') && function_exists('libxml_disable_entity_loader')) {
-			if (PHP_VERSION_ID < 80000) {
-				// http://websec.io/2012/08/27/Preventing-XEE-in-PHP.html
-				// https://core.trac.wordpress.org/changeset/29378
-				// This function has been deprecated in PHP 8.0 because in libxml 2.9.0, external entity loading is
-				// disabled by default, so this function is no longer needed to protect against XXE attacks.
-				$loader = libxml_disable_entity_loader(true);
-			}
+			// http://websec.io/2012/08/27/Preventing-XEE-in-PHP.html
+			// https://core.trac.wordpress.org/changeset/29378
+			// This function has been deprecated in PHP 8.0 because in libxml 2.9.0, external entity loading is
+			// disabled by default, but is still needed when LIBXML_NOENT is used.
+			$loader = @libxml_disable_entity_loader(true);
 			$XMLobject = simplexml_load_string($XMLstring, 'SimpleXMLElement', LIBXML_NOENT);
 			$return = self::SimpleXMLelement2array($XMLobject);
-			if (PHP_VERSION_ID < 80000 && isset($loader)) {
-				libxml_disable_entity_loader($loader);
-			}
+			@libxml_disable_entity_loader($loader);
 			return $return;
 		}
 		return false;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 9f094097e1..fd9143d561 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.8-alpha-50713';
+$wp_version = '5.8-alpha-50714';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.