From 5fe76184f26fdc1a073153b77a8322072b1f662a Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Mon, 1 Jul 2019 08:26:25 +0000 Subject: [PATCH] Coding Standards: Fix the `Squiz.PHP.DisallowMultipleAssignments` violations in the base directory. See #47632. git-svn-id: https://develop.svn.wordpress.org/trunk@45582 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-login.php | 3 ++- src/wp-settings.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/wp-login.php b/src/wp-login.php index dabab938d4..9532a77f13 100644 --- a/src/wp-login.php +++ b/src/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/src/wp-settings.php b/src/wp-settings.php index 66a76c665b..bac9b07a05 100644 --- a/src/wp-settings.php +++ b/src/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(); }