Make WordPress Core

Ticket #40348: 40348.2.svn.patch

File 40348.2.svn.patch, 1.3 KB (added by johnjamesjacoby, 4 years ago)

Refresh, using Subversion instead of Git this time

  • src/wp-admin/user/admin.php

     
    1111
    1212require_once dirname( __DIR__ ) . '/admin.php';
    1313
    14 if ( ! is_multisite() ) {
    15         wp_redirect( admin_url() );
    16         exit;
    17 }
     14if ( is_multisite() ) {
     15        $redirect_user_admin_request = ( 0 !== strcasecmp( $current_blog->domain, $current_site->domain ) || 0 !== strcasecmp( $current_blog->path, $current_site->path ) );
     16        $redirect_to_url             = user_admin_url();
     17} else {
     18        $redirect_user_admin_request = true;
     19        $redirect_to_url             = admin_url( 'profile.php' );
     20 }
    1821
    19 $redirect_user_admin_request = ( 0 !== strcasecmp( $current_blog->domain, $current_site->domain ) || 0 !== strcasecmp( $current_blog->path, $current_site->path ) );
    20 
    2122/**
    22  * Filters whether to redirect the request to the User Admin in Multisite.
     23 * Filters whether to redirect the request to the User Admin.
    2324 *
    2425 * @since 3.2.0
    2526 *
     
    2829$redirect_user_admin_request = apply_filters( 'redirect_user_admin_request', $redirect_user_admin_request );
    2930
    3031if ( $redirect_user_admin_request ) {
    31         wp_redirect( user_admin_url() );
     32        wp_redirect( $redirect_to_url );
    3233        exit;
    3334}
    3435
    35 unset( $redirect_user_admin_request );
     36unset( $redirect_user_admin_request, $redirect_to_url );