enmi-conf.org: comparison wp/wp-includes/ms-load.php

equal deleted inserted replaced

-:3d4e9c994f10
+:a86126ab1dd4
 function is_subdomain_install() {
 	if ( defined( 'SUBDOMAIN_INSTALL' ) ) {
 		return SUBDOMAIN_INSTALL;
 	}
-	return ( defined( 'VHOST' ) && VHOST == 'yes' );
+	return ( defined( 'VHOST' ) && 'yes' === VHOST );
 }
 /**
 * Returns array of network plugin files to be included in global scope.
 *
 * manually, define `WP_PLUGIN_DIR` and `WP_PLUGIN_URL` in `wp-config.php`.
 *
 * @access private
 * @since 3.1.0
 *
-* @return array Files to include.
+* @return string[] Array of absolute paths to files to include.
 */
 function wp_get_active_network_plugins() {
 	$active_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
 	if ( empty( $active_plugins ) ) {
 		return array();
 	$plugins        = array();
 	$active_plugins = array_keys( $active_plugins );
 	sort( $active_plugins );
 	foreach ( $active_plugins as $plugin ) {
-		if ( ! validate_file( $plugin ) // $plugin must validate as file
+		if ( ! validate_file( $plugin )                     // $plugin must validate as file.
-			&& '.php' == substr( $plugin, -4 ) // $plugin must end with '.php'
+			&& '.php' === substr( $plugin, -4 )             // $plugin must end with '.php'.
-			&& file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist
+			&& file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist.
 			) {
 			$plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
 		}
 	}
 	/**
 	 * Filters checking the status of the current blog.
 	 *
 	 * @since 3.0.0
 	 *
-	 * @param bool null Whether to skip the blog status check. Default null.
+	 * @param bool|null $check Whether to skip the blog status check. Default null.
 	 */
 	$check = apply_filters( 'ms_site_check', null );
 	if ( null !== $check ) {
 		return true;
 	}
-	// Allow super admins to see blocked sites
+	// Allow super admins to see blocked sites.
 	if ( is_super_admin() ) {
 		return true;
 	}
 	$blog = get_site();
 		if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) ) {
 			return WP_CONTENT_DIR . '/blog-inactive.php';
 		} else {
 			$admin_email = str_replace( '@', ' AT ', get_site_option( 'admin_email', 'support@' . get_network()->domain ) );
 			wp_die(
-				/* translators: %s: admin email link */
 				sprintf(
+					/* translators: %s: Admin email link. */
 					__( 'This site has not been activated yet. If you are having problems activating your site, please contact %s.' ),
 					sprintf( '<a href="mailto:%1$s">%1$s</a>', $admin_email )
 				)
 			);
 		}
 	}
-	if ( $blog->archived == '1' || $blog->spam == '1' ) {
+	if ( '1' == $blog->archived || '1' == $blog->spam ) {
 		if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) ) {
 			return WP_CONTENT_DIR . '/blog-suspended.php';
 		} else {
 			wp_die( __( 'This site has been archived or suspended.' ), '', array( 'response' => 410 ) );
 		}
 	 * can be found at the requested domain and path. Otherwise, return
 	 * a site object.
 	 *
 	 * @since 3.9.0
 	 *
-	 * @param null|bool|WP_Site $site     Site value to return by path.
+	 * @param null|false|WP_Site $site     Site value to return by path. Default null
-	 * @param string            $domain   The requested domain.
+	 *                                     to continue retrieving the site.
-	 * @param string            $path     The requested path, in full.
+	 * @param string             $domain   The requested domain.
-	 * @param int|null          $segments The suggested number of paths to consult.
+	 * @param string             $path     The requested path, in full.
-	 *                                    Default null, meaning the entire path was to be consulted.
+	 * @param int|null           $segments The suggested number of paths to consult.
-	 * @param array             $paths    The paths to search for, based on $path and $segments.
+	 *                                     Default null, meaning the entire path was to be consulted.
+	 * @param string[]           $paths    The paths to search for, based on $path and $segments.
 	 */
 	$pre = apply_filters( 'pre_get_site_by_path', null, $domain, $path, $segments, $paths );
 	if ( null !== $pre ) {
 		if ( false !== $pre && ! $pre instanceof WP_Site ) {
 			$pre = new WP_Site( $pre );
 		return $pre;
 	}
 	/*
 	 * @todo
-	 * caching, etc. Consider alternative optimization routes,
+	 * Caching, etc. Consider alternative optimization routes,
 	 * perhaps as an opt-in for plugins, rather than using the pre_* filter.
 	 * For example: The segments filter can expand or ignore paths.
 	 * If persistent caching is enabled, we could query the DB for a path <> '/'
 	 * then cache whether we can just always ignore paths.
 	 */
 		$current_site->id     = defined( 'SITE_ID_CURRENT_SITE' ) ? SITE_ID_CURRENT_SITE : 1;
 		$current_site->domain = DOMAIN_CURRENT_SITE;
 		$current_site->path   = PATH_CURRENT_SITE;
 		if ( defined( 'BLOG_ID_CURRENT_SITE' ) ) {
 			$current_site->blog_id = BLOG_ID_CURRENT_SITE;
-		} elseif ( defined( 'BLOGID_CURRENT_SITE' ) ) { // deprecated.
+		} elseif ( defined( 'BLOGID_CURRENT_SITE' ) ) { // Deprecated.
 			$current_site->blog_id = BLOGID_CURRENT_SITE;
 		}
 		if ( 0 === strcasecmp( $current_site->domain, $domain ) && 0 === strcasecmp( $current_site->path, $path ) ) {
 			$current_blog = get_site_by_path( $domain, $path );
 		/*
 		 * A "subdomain" installation can be re-interpreted to mean "can support any domain".
 		 * If we're not dealing with one of these installations, then the important part is determining
 		 * the network first, because we need the network's path to identify any sites.
 		 */
-		if ( ! $current_site = wp_cache_get( 'current_network', 'site-options' ) ) {
+		$current_site = wp_cache_get( 'current_network', 'site-options' );
+		if ( ! $current_site ) {
 			// Are there even two networks installed?
 			$networks = get_networks( array( 'number' => 2 ) );
 			if ( count( $networks ) === 1 ) {
 				$current_site = array_shift( $networks );
 				wp_cache_add( 'current_network', $current_site, 'site-options' );
 	}
 	// During activation of a new subdomain, the requested site does not yet exist.
 	if ( empty( $current_blog ) && wp_installing() ) {
 		$current_blog          = new stdClass;
-		$current_blog->blog_id = $blog_id = 1;
+		$current_blog->blog_id = 1;
+		$blog_id               = 1;
 		$current_blog->public  = 1;
 	}
 	// No site has been found, bail.
 	if ( empty( $current_blog ) ) {
 		if ( $subdomain && ! defined( 'NOBLOGREDIRECT' ) ) {
 			// For a "subdomain" installation, redirect to the signup form specifically.
 			$destination .= 'wp-signup.php?new=' . str_replace( '.' . $current_site->domain, '', $domain );
 		} elseif ( $subdomain ) {
-			// For a "subdomain" installation, the NOBLOGREDIRECT constant
+			/*
-			// can be used to avoid a redirect to the signup form.
+			 * For a "subdomain" installation, the NOBLOGREDIRECT constant
-			// Using the ms_site_not_found action is preferred to the constant.
+			 * can be used to avoid a redirect to the signup form.
+			 * Using the ms_site_not_found action is preferred to the constant.
+			 */
 			if ( '%siteurl%' !== NOBLOGREDIRECT ) {
 				$destination = NOBLOGREDIRECT;
 			}
 		} elseif ( 0 === strcasecmp( $current_site->domain, $domain ) ) {
 			/*
 	$msg  .= '<p>' . __( 'If your site does not display, please contact the owner of this network.' ) . '';
 	$msg  .= ' ' . __( 'If you are the owner of this network please check that MySQL is running properly and all tables are error free.' ) . '</p>';
 	$query = $wpdb->prepare( 'SHOW TABLES LIKE %s', $wpdb->esc_like( $wpdb->site ) );
 	if ( ! $wpdb->get_var( $query ) ) {
 		$msg .= '<p>' . sprintf(
-			/* translators: %s: table name */
+			/* translators: %s: Table name. */
 			__( '<strong>Database tables are missing.</strong> This means that MySQL is not running, WordPress was not installed properly, or someone deleted %s. You really should look at your database now.' ),
 			'<code>' . $wpdb->site . '</code>'
 		) . '</p>';
 	} else {
 		$msg .= '<p>' . sprintf(
-			/* translators: 1: site url, 2: table name, 3: database name */
+			/* translators: 1: Site URL, 2: Table name, 3: Database name. */
 			__( '<strong>Could not find site %1$s.</strong> Searched for table %2$s in database %3$s. Is that right?' ),
 			'<code>' . rtrim( $domain . $path, '/' ) . '</code>',
 			'<code>' . $wpdb->blogs . '</code>',
 			'<code>' . DB_NAME . '</code>'
 		) . '</p>';
 	}
 	$msg .= '<p><strong>' . __( 'What do I do now?' ) . '</strong> ';
-	/* translators: %s: Codex URL */
 	$msg .= sprintf(
-		__( 'Read the <a href="%s" target="_blank">bug report</a> page. Some of the guidelines there may help you figure out what went wrong.' ),
+		/* translators: %s: Documentation URL. */
-		__( 'https://codex.wordpress.org/Debugging_a_WordPress_Network' )
+		__( 'Read the <a href="%s" target="_blank">Debugging a WordPress Network</a> article. Some of the suggestions there may help you figure out what went wrong.' ),
+		__( 'https://wordpress.org/support/article/debugging-a-wordpress-network/' )
 	);
 	$msg .= ' ' . __( 'If you&#8217;re still stuck with this message, then check that your database contains the following tables:' ) . '</p><ul>';
 	foreach ( $wpdb->tables( 'global' ) as $t => $table ) {
-		if ( 'sitecategories' == $t ) {
+		if ( 'sitecategories' === $t ) {
 			continue;
 		}
 		$msg .= '<li>' . $table . '</li>';
 	}
 	$msg .= '</ul>';

changeset 16	a86126ab1dd4
parent 9	177826044cd9
child 18	be944660c56a