From 50aa7f980c11ca9770543030eb51b3aa7289882f Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Mon, 27 Jan 2020 14:28:12 +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. git-svn-id: https://develop.svn.wordpress.org/trunk@47115 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/network/admin.php | 4 +++- src/wp-admin/user/admin.php | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/wp-admin/network/admin.php b/src/wp-admin/network/admin.php index 693fa5aa11..2c7c04ed02 100644 --- a/src/wp-admin/network/admin.php +++ b/src/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/src/wp-admin/user/admin.php b/src/wp-admin/user/admin.php index 9df8f2029e..6d7b27aaa4 100644 --- a/src/wp-admin/user/admin.php +++ b/src/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 );