chore: fix type case issue with id's of multisite

Author: up1512001

assets/src/components/MultiSites.js

@@ -173,8 +173,8 @@ const MultiSites = ( { setBrandSites, brandSites, setNotice } ) => {
 					{ /* create multi select checkbox list of sites excluding current site */ }
 					{ sites?.length > 0 ? (
 						<div style={ { maxHeight: '400px', overflowY: 'auto', padding: '4px 4px' } }>
-							{ sites?.filter( ( site ) => site.id !== CURRENT_SITE_ID )
-								.filter( ( site ) => ! brandSites?.some( ( brandSite ) => brandSite.id === site.id ) )
+							{ sites?.filter( ( site ) => String( site.id ) !== CURRENT_SITE_ID &&
+                                    ! brandSites?.some( ( brandSite ) => String( brandSite.id ) === String( site.id ) ) )
 								.map( ( site ) => (
 									<CheckboxControl
 										key={ site.id }
@@ -188,8 +188,7 @@ const MultiSites = ( { setBrandSites, brandSites, setNotice } ) => {
 						<p>{ __( 'No other sites available in this multisite network.', 'onedesign' ) }</p>
 					) }
 
-					{ sites?.length > 0 && sites?.filter( ( site ) => site.id !== CURRENT_SITE_ID )
-						.filter( ( site ) => ! brandSites?.some( ( brandSite ) => brandSite.id === site.id ) ).length === 0 && (
+					{ sites?.length > 0 && sites?.filter( ( site ) => String( site.id ) !== CURRENT_SITE_ID && ! brandSites?.some( ( brandSite ) => String( brandSite.id ) === String( site.id ) ) ).length === 0 && (
 						<p>{ __( 'All sites in this multisite network have already been added as brand sites.', 'onedesign' ) }</p>
 					) }
 

assets/src/js/constants.js

@@ -27,7 +27,7 @@ const PER_PAGE = 9;
 const MULTISITES = settings?.multisites || [];
 const IS_MULTISITE = settings?.isMultisite || false;
 const IS_GOVERNING_SITE_SELECTED = settings?.isGoverningSiteSelected || false;
-const CURRENT_SITE_ID = settings?.currentSiteId || '';
+const CURRENT_SITE_ID = String( settings?.currentSiteId ) || '';
 
 export {
 	API_NAMESPACE,

inc/classes/class-multisite.php

@@ -110,15 +110,19 @@ public function sync_api_key_to_governing_site( string $secret_key, int $blog_id
 
 		// go to governing site and update shared_sites option secret_key of blog_id site.
 		if ( $governing_site_id && $secret_key ) {
-			switch_to_blog( $governing_site_id );
+			if ( ! switch_to_blog( (int) $governing_site_id ) ) {
+				return;
+			}
 			$shared_sites = get_option( Constants::ONEDESIGN_SHARED_SITES, array() );
 			foreach ( $shared_sites as &$site ) {
 				if ( (int) $site['id'] === (int) $blog_id ) {
 					$site['api_key'] = $secret_key;
 					break;
 				}
 			}
+
 			update_option( Constants::ONEDESIGN_SHARED_SITES, $shared_sites, false );
+
 			restore_current_blog();
 		}
 	}

inc/classes/rest/class-multisite.php

@@ -167,8 +167,13 @@ public function set_multisite_governing_site( \WP_REST_Request $request ): WP_RE
 
 		// set all existing sites site-type as brand-site and current site as governing-site.
 		$multisite_info = Utils::get_all_multisites_info();
+
 		foreach ( $multisite_info as $site ) {
-			switch_to_blog( $site['id'] );
+
+			if ( ! switch_to_blog( (int) $site['id'] ) ) {
+				continue;
+			}
+
 			if ( intval( $site['id'] ) === intval( $governing_site_id ) ) {
 				update_option( Constants::ONEDESIGN_SITE_TYPE, 'governing-site', false );
 				delete_option( Constants::ONEDESIGN_GOVERNING_SITE_URL );
@@ -179,6 +184,7 @@ public function set_multisite_governing_site( \WP_REST_Request $request ): WP_RE
 				delete_option( Constants::ONEDESIGN_GOVERNING_SITE_URL );
 				delete_option( Constants::ONEDESIGN_SHARED_SITES );
 			}
+
 			restore_current_blog();
 		}
 
@@ -227,7 +233,9 @@ public function add_multisite_sites( \WP_REST_Request $request ): WP_REST_Respon
 		foreach ( $site_ids as $site_id ) {
 
 			// switch to each site and update option of onedesign_site_type as brand-site.
-			switch_to_blog( $site_id );
+			if ( ! switch_to_blog( (int) $site_id ) ) {
+				continue;
+			}
 
 			$shared_sites[] = array(
 				'id'          => $site_id,
@@ -247,8 +255,16 @@ public function add_multisite_sites( \WP_REST_Request $request ): WP_REST_Respon
 		}
 
 		// update shared sites in governing site.
-		switch_to_blog( $governing_site_id );
+		if ( ! switch_to_blog( (int) $governing_site_id ) ) {
+			return new WP_Error(
+				sprintf( 'failed_to_switch_blog_%d', $governing_site_id ),
+				__( 'Failed to switch to governing site blog.', 'onedesign' ),
+				array( 'status' => 500 )
+			);
+		}
+
 		update_option( Constants::ONEDESIGN_SHARED_SITES, $shared_sites, false );
+
 		restore_current_blog();
 
 		return new WP_REST_Response(
@@ -265,7 +281,9 @@ public function add_multisite_sites( \WP_REST_Request $request ): WP_REST_Respon
 	 * @return WP_REST_Response
 	 */
 	public function get_all_multisite_sites(): WP_REST_Response {
+
 		$all_multisites = Utils::get_all_multisites_info();
+
 		return new WP_REST_Response(
 			array(
 				'success' => true,

languages/onedesign.pot

@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2025-10-24T12:25:13+00:00\n"
+"POT-Creation-Date: 2025-10-24T12:43:01+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.12.0\n"
 
@@ -265,18 +265,22 @@ msgid "Governing site removed successfully."
 msgstr ""
 
 #: inc/classes/rest/class-multisite.php:152
-#: inc/classes/rest/class-multisite.php:207
+#: inc/classes/rest/class-multisite.php:213
 msgid "Invalid site info provided."
 msgstr ""
 
 #: inc/classes/rest/class-multisite.php:163
 msgid "Failed to update governing site."
 msgstr ""
 
-#: inc/classes/rest/class-multisite.php:218
+#: inc/classes/rest/class-multisite.php:224
 msgid "No governing site set. Please set a governing site first."
 msgstr ""
 
+#: inc/classes/rest/class-multisite.php:261
+msgid "Failed to switch to governing site blog."
+msgstr ""
+
 #: inc/classes/rest/class-patterns.php:236
 #: inc/classes/rest/class-patterns.php:359
 #: inc/classes/rest/class-patterns.php:569