Skip to content

Atomic: Display correct site visibility in wp-admin settings #45510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 17, 2025
Merged

Atomic: Display correct site visibility in wp-admin settings #45510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f983ec5
Atomic: Display correct site visibility in wp-admin settings.
sergeymitr Oct 15, 2025
943fa9f
Suppress phan false-positive.
sergeymitr Oct 15, 2025
160a625
Limit the change to WoA sites only.
sergeymitr Oct 16, 2025
7ff7ea2
Properly fetch site title for the visibility data.
sergeymitr Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions projects/packages/jetpack-mu-wpcom/changelog/update-woa-actual-site-visibility
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

Atomic sites: Display site visibility in wp-admin settings based on the privacy model instead of the 'blog_public' option value.
38 changes: 23 additions & 15 deletions ...ackages/jetpack-mu-wpcom/src/features/replace-site-visibility/replace-site-visibility.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*/

use Automattic\Jetpack\Connection\Client;
use Automattic\Jetpack\Status\Host;

/**
* Load dependencies.
Expand Down Expand Up @@ -107,25 +108,32 @@ function wpcom_get_site_preview_link() {
function replace_site_visibility_load_assets() {
$handle = jetpack_mu_wpcom_enqueue_assets( 'wpcom-replace-site-visibility', array( 'js', 'css' ) );

$data = wp_json_encode(
array(
'homeUrl' => home_url( '/' ),
'siteTitle' => bloginfo( 'name' ),
'isWpcomStagingSite' => (bool) get_option( 'wpcom_is_staging_site' ),
'isUnlaunchedSite' => get_option( 'launch-status' ) === 'unlaunched',
'hasSitePreviewLink' => function_exists( 'wpcom_site_has_feature' ) && wpcom_site_has_feature( \WPCOM_Features::SITE_PREVIEW_LINKS ),
'sitePreviewLink' => wpcom_get_site_preview_link(),
'sitePreviewLinkNonce' => wp_create_nonce( 'wpcom_site_visibility_site_preview_link' ),
'blogPublic' => get_option( 'blog_public' ),
'wpcomComingSoon' => get_option( 'wpcom_coming_soon' ),
'wpcomPublicComingSoon' => get_option( 'wpcom_public_coming_soon' ),
'wpcomDataSharingOptOut' => (bool) get_option( 'wpcom_data_sharing_opt_out' ),
)
$data = array(
'homeUrl' => home_url( '/' ),
'siteTitle' => get_bloginfo( 'name' ),
'isWpcomStagingSite' => (bool) get_option( 'wpcom_is_staging_site' ),
'isUnlaunchedSite' => get_option( 'launch-status' ) === 'unlaunched',
'hasSitePreviewLink' => function_exists( 'wpcom_site_has_feature' ) && wpcom_site_has_feature( \WPCOM_Features::SITE_PREVIEW_LINKS ),
'sitePreviewLink' => wpcom_get_site_preview_link(),
'sitePreviewLinkNonce' => wp_create_nonce( 'wpcom_site_visibility_site_preview_link' ),
'blogPublic' => get_option( 'blog_public' ),
'wpcomComingSoon' => get_option( 'wpcom_coming_soon' ),
'wpcomPublicComingSoon' => get_option( 'wpcom_public_coming_soon' ),
'wpcomDataSharingOptOut' => (bool) get_option( 'wpcom_data_sharing_opt_out' ),
);

// If the site is launched, replace the option value with the actual site visibility.
if ( ( new Host() )->is_woa_site() && function_exists( '\Private_Site\site_is_private' )
&& ! $data['isUnlaunchedSite'] && ! $data['wpcomPublicComingSoon'] && ! $data['wpcomComingSoon'] && (string) $data['blogPublic'] !== '0'
) {
// @phan-suppress-next-line PhanUndeclaredFunction
$data['blogPublic'] = \Private_Site\site_is_private() ? '-1' : '1';
}

$encoded_data = wp_json_encode( $data );
wp_add_inline_script(
$handle,
"var JETPACK_MU_WPCOM_SITE_VISIBILITY = $data;",
"var JETPACK_MU_WPCOM_SITE_VISIBILITY = $encoded_data;",
'before'
);
}
Expand Down