From ecd822a8802de0202651e5a9a323b582039614b5 Mon Sep 17 00:00:00 2001 From: Aaron Jorbin Date: Sat, 14 Sep 2019 19:23:55 +0000 Subject: [PATCH] Comment out magic quote functions Follow up to r46112. See: #47751,#47783, #48040. Built from https://develop.svn.wordpress.org/trunk@46113 git-svn-id: http://core.svn.wordpress.org/trunk@45925 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/ID3/getid3.php | 4 ++++ wp-includes/version.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/wp-includes/ID3/getid3.php b/wp-includes/ID3/getid3.php index 9eb3c82d55..178c7cc1af 100644 --- a/wp-includes/ID3/getid3.php +++ b/wp-includes/ID3/getid3.php @@ -294,6 +294,9 @@ class getID3 $this->startup_error .= 'WARNING: php.ini contains "mbstring.func_overload = '.ini_get('mbstring.func_overload').'", getID3 cannot run with this setting (bitmask 2 (string functions) cannot be set). Recommended to disable entirely.'."\n"; } + // 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()) { @@ -307,6 +310,7 @@ 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 if (!include_once(GETID3_INCLUDEPATH.'getid3.lib.php')) { diff --git a/wp-includes/version.php b/wp-includes/version.php index 824885b532..215c023329 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.3-alpha-46112'; +$wp_version = '5.3-alpha-46113'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.