--- a/wp/wp-includes/ms-load.php Thu Sep 29 08:06:27 2022 +0200
+++ b/wp/wp-includes/ms-load.php Fri Sep 05 18:40:08 2025 +0200
@@ -46,7 +46,7 @@
foreach ( $active_plugins as $plugin ) {
if ( ! validate_file( $plugin ) // $plugin must validate as file.
- && '.php' === substr( $plugin, -4 ) // $plugin must end with '.php'.
+ && str_ends_with( $plugin, '.php' ) // $plugin must end with '.php'.
&& file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist.
) {
$plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
@@ -92,7 +92,7 @@
$blog = get_site();
- if ( '1' == $blog->deleted ) {
+ if ( '1' === $blog->deleted ) {
if ( file_exists( WP_CONTENT_DIR . '/blog-deleted.php' ) ) {
return WP_CONTENT_DIR . '/blog-deleted.php';
} else {
@@ -100,7 +100,7 @@
}
}
- if ( '2' == $blog->deleted ) {
+ if ( '2' === $blog->deleted ) {
if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) ) {
return WP_CONTENT_DIR . '/blog-inactive.php';
} else {
@@ -115,7 +115,7 @@
}
}
- if ( '1' == $blog->archived || '1' == $blog->spam ) {
+ if ( '1' === $blog->archived || '1' === $blog->spam ) {
if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) ) {
return WP_CONTENT_DIR . '/blog-suspended.php';
} else {
@@ -226,10 +226,12 @@
* then cache whether we can just always ignore paths.
*/
- // Either www or non-www is supported, not both. If a www domain is requested,
- // query for both to provide the proper redirect.
+ /*
+ * Either www or non-www is supported, not both. If a www domain is requested,
+ * query for both to provide the proper redirect.
+ */
$domains = array( $domain );
- if ( 'www.' === substr( $domain, 0, 4 ) ) {
+ if ( str_starts_with( $domain, 'www.' ) ) {
$domains[] = substr( $domain, 4 );
}
@@ -297,7 +299,7 @@
// If the network is defined in wp-config.php, we can simply use that.
if ( defined( 'DOMAIN_CURRENT_SITE' ) && defined( 'PATH_CURRENT_SITE' ) ) {
- $current_site = new stdClass;
+ $current_site = new stdClass();
$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;
@@ -310,8 +312,10 @@
if ( 0 === strcasecmp( $current_site->domain, $domain ) && 0 === strcasecmp( $current_site->path, $path ) ) {
$current_blog = get_site_by_path( $domain, $path );
} elseif ( '/' !== $current_site->path && 0 === strcasecmp( $current_site->domain, $domain ) && 0 === stripos( $path, $current_site->path ) ) {
- // If the current network has a path and also matches the domain and path of the request,
- // we need to look for a site using the first path segment following the network's path.
+ /*
+ * If the current network has a path and also matches the domain and path of the request,
+ * we need to look for a site using the first path segment following the network's path.
+ */
$current_blog = get_site_by_path( $domain, $path, 1 + count( explode( '/', trim( $current_site->path, '/' ) ) ) );
} else {
// Otherwise, use the first path segment (as usual).
@@ -373,7 +377,7 @@
}
// The network declared by the site trumps any constants.
- if ( $current_blog && $current_blog->site_id != $current_site->id ) {
+ if ( $current_blog && (int) $current_blog->site_id !== $current_site->id ) {
$current_site = WP_Network::get_instance( $current_blog->site_id );
}
@@ -387,7 +391,7 @@
// 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 = new stdClass();
$current_blog->blog_id = 1;
$blog_id = 1;
$current_blog->public = 1;
@@ -472,12 +476,12 @@
$msg = '<h1>' . $title . '</h1>';
$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>';
+ $msg .= ' ' . __( 'If you are the owner of this network please check that your host’s database server 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. */
- __( '<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.' ),
+ __( '<strong>Database tables are missing.</strong> This means that your host’s database server 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 {
@@ -493,7 +497,7 @@
$msg .= sprintf(
/* translators: %s: Documentation URL. */
__( '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/' )
+ __( 'https://developer.wordpress.org/advanced-administration/debug/debug-network/' )
);
$msg .= ' ' . __( 'If you are still stuck with this message, then check that your database contains the following tables:' ) . '</p><ul>';
foreach ( $wpdb->tables( 'global' ) as $t => $table ) {