vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-11 20:30:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Multisite: Remove $domain and $path globals in ms_not_installed()

Browse Source 
Further reduces the reliance on these unnecessary globals.

Fixes #27264.


git-svn-id: https://develop.svn.wordpress.org/trunk@33989 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jeremy Felt
2015-09-10 03:52:21 +00:00
parent ef1f697564
commit d0706ac9ca
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wp-includes/ms-settings.php
+4 -4
View File
@@ -78,7 +78,7 @@ if ( !isset( $current_site ) || !isset( $current_blog ) ) {
$current_site = wp_get_network( $one_network );
wp_cache_add( 'current_network', $current_site, 'site-options' );
} elseif ( 0 === $wpdb->num_rows ) {
ms_not_installed();
ms_not_installed( $domain, $path );
}
}
if ( empty( $current_site ) ) {
@@ -86,7 +86,7 @@ if ( !isset( $current_site ) || !isset( $current_blog ) ) {
}
if ( empty( $current_site ) ) {
ms_not_installed();
ms_not_installed( $domain, $path );
} elseif ( $path === $current_site->path ) {
$current_blog = get_site_by_path( $domain, $path );
} else {
@@ -111,7 +111,7 @@ if ( !isset( $current_site ) || !isset( $current_blog ) ) {
// No network has been found, bail.
if ( empty( $current_site ) ) {
ms_not_installed();
ms_not_installed( $domain, $path );
}
// @todo Investigate when exactly this can occur.
@@ -156,7 +156,7 @@ if ( !isset( $current_site ) || !isset( $current_blog ) ) {
* it's no use redirecting back to ourselves -- it'll cause a loop.
* As we couldn't find a site, we're simply not installed.
*/
ms_not_installed();
ms_not_installed( $domain, $path );
}
header( 'Location: ' . $destination );