From e65032ff6ba5e87f7e150273e5e32711291373e6 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Mon, 27 Jan 2020 14:30:05 +0000
Subject: [PATCH] Coding Standards: Use strict comparison in
 `wp-admin/user/admin.php`.

Apply the case-insensitive network-site comparisons added in [27725] for `wp-admin/network/admin.php` to `wp-admin/user/admin.php` too, for consistency.

Props rimadoshi.
Fixes #49300.
Built from https://develop.svn.wordpress.org/trunk@47115


git-svn-id: http://core.svn.wordpress.org/trunk@46915 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/network/admin.php | 4 +++-
 wp-admin/user/admin.php    | 5 ++++-
 wp-includes/version.php    | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/wp-admin/network/admin.php b/wp-admin/network/admin.php
index 693fa5aa11..2c7c04ed02 100644
--- a/wp-admin/network/admin.php
+++ b/wp-admin/network/admin.php
@@ -17,7 +17,7 @@ if ( ! is_multisite() ) {
 	wp_die( __( 'Multisite support is not enabled.' ) );
 }
 
-$redirect_network_admin_request = 0 !== strcasecmp( $current_blog->domain, $current_site->domain ) || 0 !== strcasecmp( $current_blog->path, $current_site->path );
+$redirect_network_admin_request = ( 0 !== strcasecmp( $current_blog->domain, $current_site->domain ) || 0 !== strcasecmp( $current_blog->path, $current_site->path ) );
 
 /**
  * Filters whether to redirect the request to the Network Admin.
@@ -27,8 +27,10 @@ $redirect_network_admin_request = 0 !== strcasecmp( $current_blog->domain, $curr
  * @param bool $redirect_network_admin_request Whether the request should be redirected.
  */
 $redirect_network_admin_request = apply_filters( 'redirect_network_admin_request', $redirect_network_admin_request );
+
 if ( $redirect_network_admin_request ) {
 	wp_redirect( network_admin_url() );
 	exit;
 }
+
 unset( $redirect_network_admin_request );
diff --git a/wp-admin/user/admin.php b/wp-admin/user/admin.php
index 9df8f2029e..6d7b27aaa4 100644
--- a/wp-admin/user/admin.php
+++ b/wp-admin/user/admin.php
@@ -16,7 +16,8 @@ if ( ! is_multisite() ) {
 	exit;
 }
 
-$redirect_user_admin_request = ( ( $current_blog->domain != $current_site->domain ) || ( $current_blog->path != $current_site->path ) );
+$redirect_user_admin_request = ( 0 !== strcasecmp( $current_blog->domain, $current_site->domain ) || 0 !== strcasecmp( $current_blog->path, $current_site->path ) );
+
 /**
  * Filters whether to redirect the request to the User Admin in Multisite.
  *
@@ -25,8 +26,10 @@ $redirect_user_admin_request = ( ( $current_blog->domain != $current_site->domai
  * @param bool $redirect_user_admin_request Whether the request should be redirected.
  */
 $redirect_user_admin_request = apply_filters( 'redirect_user_admin_request', $redirect_user_admin_request );
+
 if ( $redirect_user_admin_request ) {
 	wp_redirect( user_admin_url() );
 	exit;
 }
+
 unset( $redirect_user_admin_request );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index f96151bbe5..6dcd1954d5 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.4-alpha-47114';
+$wp_version = '5.4-alpha-47115';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.