sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Address redirection loop with multiple networks and network admin. Props mwidmann, fixes #15591

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@16633 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Pete Mall 2010-11-30 20:45:40 +00:00
parent 4331aa9663
commit 86bc8c04a2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/ms-settings.php
View File

@ -59,9 +59,11 @@ if ( !isset( $current_site ) || !isset( $current_blog ) ) {
if ( $current_blog )
wp_cache_set( 'current_blog_' . $domain, $current_blog, 'site-options' );
}
if ( $current_blog && $current_blog->site_id != $current_site->id )
if ( $current_blog && $current_blog->site_id != $current_site->id ) {
$current_site = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->site WHERE id = %d", $current_blog->site_id ) );
else
if ( ! isset( $current_site->blog_id ) )
$current_site->blog_id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s", $current_site->domain, $current_site->path ) );
} else
$blogname = substr( $domain, 0, strpos( $domain, '.' ) );
} else {
$blogname = htmlspecialchars( substr( $_SERVER[ 'REQUEST_URI' ], strlen( $path ) ) );