From cad4a1a3d7e6b45b4dc7adddb724bab545bba193 Mon Sep 17 00:00:00 2001 From: desrosj Date: Thu, 29 Oct 2020 18:00:08 +0000 Subject: [PATCH] External Libraries: Disable deserialization in Requests_Utility_FilteredIterator Props xknown, peterwilsoncc, desrosj, dd32, whyisjake. Merges [49373] to trunk. Built from https://develop.svn.wordpress.org/trunk@49382 git-svn-id: http://core.svn.wordpress.org/trunk@49141 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../Requests/Utility/FilteredIterator.php | 16 ++++++++++++++++ wp-includes/version.php | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/wp-includes/Requests/Utility/FilteredIterator.php b/wp-includes/Requests/Utility/FilteredIterator.php index 76a29e7228..0e27944932 100644 --- a/wp-includes/Requests/Utility/FilteredIterator.php +++ b/wp-includes/Requests/Utility/FilteredIterator.php @@ -42,4 +42,20 @@ class Requests_Utility_FilteredIterator extends ArrayIterator { $value = call_user_func($this->callback, $value); return $value; } + + /** + * @inheritdoc + */ + public function unserialize( $serialized ) { + } + + /** + * @inheritdoc + */ + public function __unserialize( $serialized ) { // phpcs:ignore PHPCompatibility.FunctionNameRestrictions.ReservedFunctionNames.MethodDoubleUnderscore,PHPCompatibility.FunctionNameRestrictions.NewMagicMethods.__unserializeFound + } + + public function __wakeup() { // phpcs:ignore PHPCompatibility.FunctionNameRestrictions.ReservedFunctionNames.MethodDoubleUnderscore,PHPCompatibility.FunctionNameRestrictions.NewMagicMethods.__wakeupFound + unset( $this->callback ); + } } diff --git a/wp-includes/version.php b/wp-includes/version.php index 36f3a29030..5ddc6df5ef 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.6-beta2-49380'; +$wp_version = '5.6-beta2-49382'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.