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

Anchor network and user admins at the network domain and path rather than at the main site. Makes the redirects consistent with network_admin_url(). fixes #16652 for trunk 

git-svn-id: http://svn.automattic.com/wordpress/trunk@17510 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2011-03-08 22:56:12 +00:00
parent 5251aec87f
commit 3b30ea65f5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@ require_once( dirname( dirname( __FILE__ ) ) . '/admin.php' );
if ( ! is_multisite() ) if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) ); wp_die( __( 'Multisite support is not enabled.' ) );
if ( ! is_main_site() ) { if ( ( $current_blog->domain != $current_site->domain ) || ( $current_blog->path != $current_site->path ) ) {
wp_redirect( network_admin_url() ); wp_redirect( network_admin_url() );
exit; exit;
} }

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

@ -16,7 +16,7 @@ if ( ! is_multisite() ) {
exit; exit;
} }
if ( ! is_main_site() ) { if ( ( $current_blog->domain != $current_site->domain ) || ( $current_blog->path != $current_site->path ) ) {
wp_redirect( user_admin_url() ); wp_redirect( user_admin_url() );
exit; exit;
} }