From 8d7a19cdc283269ac3cf2e2889c79f15c24f7f25 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sun, 28 Jun 2020 21:09:05 +0000 Subject: [PATCH] Bootstrap/Load: Remove special handling for `REQUEST_TIME` and `REQUEST_TIME_FLOAT` server values in `wp_magic_quotes()`. This was intended as a temporary fix until `add_magic_quotes()` is modified to leave non-string values untouched, which has now been done. Follow-up to [47370], [48205]. See #48605. Built from https://develop.svn.wordpress.org/trunk@48206 git-svn-id: http://core.svn.wordpress.org/trunk@47975 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/load.php | 12 ------------ wp-includes/version.php | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/wp-includes/load.php b/wp-includes/load.php index 09fe813734..c82cd1d405 100644 --- a/wp-includes/load.php +++ b/wp-includes/load.php @@ -1008,18 +1008,6 @@ function wp_magic_quotes() { $_COOKIE = add_magic_quotes( $_COOKIE ); $_SERVER = add_magic_quotes( $_SERVER ); - /* - * Revert the type change to string for two indexes which should retain their proper type. - * Among other things, this preserves compatibility of WP with PHPUnit Code Coverage generation. - */ - if ( isset( $_SERVER['REQUEST_TIME'] ) ) { - $_SERVER['REQUEST_TIME'] = (int) $_SERVER['REQUEST_TIME']; - } - - if ( isset( $_SERVER['REQUEST_TIME_FLOAT'] ) ) { - $_SERVER['REQUEST_TIME_FLOAT'] = (float) $_SERVER['REQUEST_TIME_FLOAT']; - } - // Force REQUEST to be GET + POST. $_REQUEST = array_merge( $_GET, $_POST ); } diff --git a/wp-includes/version.php b/wp-includes/version.php index 3fbaf2d6d5..6ae477a166 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.5-alpha-48205'; +$wp_version = '5.5-alpha-48206'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.