Ticket #21143: 21143.2.diff
File 21143.2.diff, 1.6 KB (added by , 11 years ago) |
---|
-
src/wp-includes/ms-settings.php
110 110 111 111 // If we don't have a network by now, we have a problem. 112 112 if ( empty( $current_site ) ) { 113 /** 114 * Fires before ms_not_installed() when a network cannot be found to 115 * fill $current_site. 116 * 117 * @since 3.9.0 118 * 119 * @param string $domain Originally requested domain. 120 * @param string $path Originally requested path. 121 */ 122 do_action( 'network_not_found', $domain, $path ); 123 113 124 ms_not_installed(); 114 125 } 115 126 … … 130 141 } 131 142 } 132 143 144 if ( defined( 'WP_INSTALLING' ) && empty( $current_blog ) ) { 145 $current_blog->blog_id = $blog_id = 1; 146 } 147 133 148 // If we haven't figured out our site, give up. 134 149 if ( empty( $current_blog ) ) { 135 if ( defined( 'WP_INSTALLING' ) ) { 136 $current_blog->blog_id = $blog_id = 1; 150 /** 151 * Fires before redirect or ms_not_installed when a site cannot be 152 * found to fill $current_blog. 153 * 154 * @since 3.9.0 155 * 156 * @param object $current_site Contains network properties. 157 * @param string $domain Originally requested domain. 158 * @param string $path Originally requested path. 159 */ 160 do_action( 'site_not_found', $current_site, $domain, $path ); 137 161 138 } elseif ( is_subdomain_install() ) {162 if ( is_subdomain_install() ) { 139 163 // @todo This is only for an open registration subdomain network. 140 164 if ( defined( 'NOBLOGREDIRECT' ) ) { 141 165 if ( '%siteurl%' === NOBLOGREDIRECT ) {