From b2d5a4216c25942259451968f99d4f572f8581f3 Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Mon, 1 Jul 2019 08:27:58 +0000 Subject: [PATCH] Coding Standards: Fix the `Squiz.PHP.DisallowMultipleAssignments` violations in the base directory. See #47632. Built from https://develop.svn.wordpress.org/trunk@45582 git-svn-id: http://core.svn.wordpress.org/trunk@45393 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/version.php | 2 +- wp-login.php | 3 ++- wp-settings.php | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/wp-includes/version.php b/wp-includes/version.php index 70905eadb4..c01ce8c213 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.3-alpha-45581'; +$wp_version = '5.3-alpha-45582'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-login.php b/wp-login.php index dabab938d4..9532a77f13 100644 --- a/wp-login.php +++ b/wp-login.php @@ -550,7 +550,8 @@ switch ( $action ) { wp_logout(); if ( ! empty( $_REQUEST['redirect_to'] ) ) { - $redirect_to = $requested_redirect_to = $_REQUEST['redirect_to']; + $redirect_to = $_REQUEST['redirect_to']; + $requested_redirect_to = $redirect_to; } else { $redirect_to = 'wp-login.php?loggedout=true'; $requested_redirect_to = ''; diff --git a/wp-settings.php b/wp-settings.php index 66a76c665b..bac9b07a05 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -527,7 +527,8 @@ do_action( 'init' ); // Check site status if ( is_multisite() ) { - if ( true !== ( $file = ms_site_check() ) ) { + $file = ms_site_check(); + if ( true !== $file ) { require( $file ); die(); }