Merged in feature/81-dev-dev01 (pull request #5)

auto-patch  81-dev-dev01-2023-12-05T22_45_26

* auto-patch  81-dev-dev01-2023-12-05T22_45_26
This commit is contained in:
Tony Volpe
2023-12-05 23:05:59 +00:00
parent ba16964e7a
commit 725d3043d5
1463 changed files with 142461 additions and 89421 deletions

View File

@@ -844,7 +844,7 @@ function wp_uninitialize_site( $site_id ) {
*
* @since MU (3.0.0)
*
* @param string $basedir Uploads path without subdirectory. @see wp_upload_dir()
* @param string $basedir Uploads path without subdirectory. See {@see wp_upload_dir()}.
* @param int $site_id The site ID.
*/
$dir = apply_filters( 'wpmu_delete_blog_upload_dir', $uploads['basedir'], $site->id );
@@ -877,12 +877,12 @@ function wp_uninitialize_site( $site_id ) {
}
@closedir( $dh );
}
$index++;
++$index;
}
$stack = array_reverse( $stack ); // Last added directories are deepest.
foreach ( (array) $stack as $dir ) {
if ( $dir != $top_dir ) {
if ( $dir !== $top_dir ) {
@rmdir( $dir );
}
}
@@ -1130,7 +1130,7 @@ function wp_maybe_update_network_site_counts_on_update( $new_site, $old_site = n
return;
}
if ( $new_site->network_id != $old_site->network_id ) {
if ( $new_site->network_id !== $old_site->network_id ) {
wp_maybe_update_network_site_counts( $new_site->network_id );
wp_maybe_update_network_site_counts( $old_site->network_id );
}
@@ -1153,8 +1153,8 @@ function wp_maybe_transition_site_statuses_on_update( $new_site, $old_site = nul
$old_site = new WP_Site( new stdClass() );
}
if ( $new_site->spam != $old_site->spam ) {
if ( 1 == $new_site->spam ) {
if ( $new_site->spam !== $old_site->spam ) {
if ( '1' === $new_site->spam ) {
/**
* Fires when the 'spam' status is added to a site.
@@ -1177,8 +1177,8 @@ function wp_maybe_transition_site_statuses_on_update( $new_site, $old_site = nul
}
}
if ( $new_site->mature != $old_site->mature ) {
if ( 1 == $new_site->mature ) {
if ( $new_site->mature !== $old_site->mature ) {
if ( '1' === $new_site->mature ) {
/**
* Fires when the 'mature' status is added to a site.
@@ -1201,8 +1201,8 @@ function wp_maybe_transition_site_statuses_on_update( $new_site, $old_site = nul
}
}
if ( $new_site->archived != $old_site->archived ) {
if ( 1 == $new_site->archived ) {
if ( $new_site->archived !== $old_site->archived ) {
if ( '1' === $new_site->archived ) {
/**
* Fires when the 'archived' status is added to a site.
@@ -1225,8 +1225,8 @@ function wp_maybe_transition_site_statuses_on_update( $new_site, $old_site = nul
}
}
if ( $new_site->deleted != $old_site->deleted ) {
if ( 1 == $new_site->deleted ) {
if ( $new_site->deleted !== $old_site->deleted ) {
if ( '1' === $new_site->deleted ) {
/**
* Fires when the 'deleted' status is added to a site.
@@ -1249,7 +1249,7 @@ function wp_maybe_transition_site_statuses_on_update( $new_site, $old_site = nul
}
}
if ( $new_site->public != $old_site->public ) {
if ( $new_site->public !== $old_site->public ) {
/**
* Fires after the current blog's 'public' setting is updated.