WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Sergey Biryukov 2020-01-27 14:30:05 +00:00
parent c7bab2b410
commit e65032ff6b
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/network/admin.php
View File

@ -17,7 +17,7 @@ if ( ! is_multisite() ) {
wp_die( __( 'Multisite support is not enabled.' ) ); 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. * 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. * @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 ); $redirect_network_admin_request = apply_filters( 'redirect_network_admin_request', $redirect_network_admin_request );
if ( $redirect_network_admin_request ) { if ( $redirect_network_admin_request ) {
wp_redirect( network_admin_url() ); wp_redirect( network_admin_url() );
exit; exit;
} }
unset( $redirect_network_admin_request ); unset( $redirect_network_admin_request );

5
wp-admin/user/admin.php
View File

@ -16,7 +16,8 @@ if ( ! is_multisite() ) {
exit; 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. * 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. * @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 ); $redirect_user_admin_request = apply_filters( 'redirect_user_admin_request', $redirect_user_admin_request );
if ( $redirect_user_admin_request ) { if ( $redirect_user_admin_request ) {
wp_redirect( user_admin_url() ); wp_redirect( user_admin_url() );
exit; exit;
} }
unset( $redirect_user_admin_request ); unset( $redirect_user_admin_request );

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.