From 589666abc3b21242c28dcea9f5e94b57032692e7 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Mon, 20 Apr 2020 15:41:08 +0000 Subject: [PATCH] External Libraries: Revert [47603]. With the Docker image for PHP 7.4 updated to stable version, this should no longer be necessary. See https://github.com/WordPress/wpdev-docker-images/pull/26 Props ocean90. Fixes #49945. Built from https://develop.svn.wordpress.org/trunk@47604 git-svn-id: http://core.svn.wordpress.org/trunk@47379 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/ID3/getid3.php | 4 ---- wp-includes/version.php | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/wp-includes/ID3/getid3.php b/wp-includes/ID3/getid3.php index 72cfde96b2..cc238253d5 100644 --- a/wp-includes/ID3/getid3.php +++ b/wp-includes/ID3/getid3.php @@ -298,9 +298,6 @@ class getID3 // check for magic quotes in PHP < 7.4.0 (when these functions became deprecated) if (version_compare(PHP_VERSION, '7.4.0', '<')) { - // WORDPRESS CHANGE FROM UPSTREAM - // Comment out deprecated function - /* // Check for magic_quotes_runtime if (function_exists('get_magic_quotes_runtime')) { if (get_magic_quotes_runtime()) { @@ -313,7 +310,6 @@ class getID3 $this->startup_error .= 'magic_quotes_gpc must be disabled before running getID3(). Surround getid3 block by set_magic_quotes_gpc(0) and set_magic_quotes_gpc(1).'."\n"; } } - **/ } // Load support library diff --git a/wp-includes/version.php b/wp-includes/version.php index 955f64fac6..6a9b40cca1 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.5-alpha-47603'; +$wp_version = '5.5-alpha-47604'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.