Always use Jetpack_Options::get_option( ‘id’ )

[scruffian]

Until recently, WP.com wouldn't return the correct site id when it called Jetpack_Options::get_option( ‘id’ ). Instead we'd have to add lots of this in the code:

if ( IS_WPCOM ) { return get_current_blog_id() } else { Jetpack_Options::get_option( 'id' ) }

However since #16561, we can use Jetpack_Options::get_option( 'id' ) on WP.com as well as self-hosted Jetpack sites, so we can remove all of these forks in the code. See also p9dueE-1Ee-p2

• jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-mailchimp.php

  Line 78 in 092d9af

  $site_id = $is_wpcom ? get_current_blog_id() : Jetpack_Options::get_option( 'id' );

• jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-search.php

  Line 52 in 874e9fd

  $site_id = $is_wpcom ? get_current_blog_id() : Jetpack_Options::get_option( 'id' );

• jetpack/_inc/lib/class-jetpack-mapbox-helper.php

  Line 88 in d37c4ec

  if ( self::is_wpcom() ) {

• jetpack/_inc/lib/class-jetpack-instagram-gallery-helper.php

  Line 105 in a1fe6f0

  $site_id = $is_wpcom ? get_current_blog_id() : Jetpack_Options::get_option( 'id' );

• jetpack/modules/videopress/class.videopress-gutenberg.php

  Line 133 in ebec0a8

  if ( defined( 'IS_WPCOM' ) && IS_WPCOM ) {

• jetpack/modules/tiled-gallery/tiled-gallery/tiled-gallery-layout.php

  Line 91 in d37c4ec

  if ( defined( 'IS_WPCOM' ) && IS_WPCOM ) {

• jetpack/_inc/lib/core-api/wpcom-fields/attachment-fields-videopress.php

  Line 66 in ea7625a

  if ( defined( 'IS_WPCOM' ) && IS_WPCOM ) {

• jetpack/modules/memberships/class-jetpack-memberships.php

  Line 344 in 60f0fa1

  if ( defined( 'IS_WPCOM' ) && IS_WPCOM ) {

• jetpack/modules/likes.php

  Line 224 in b7acf5e

  if ( defined( 'IS_WPCOM' ) && IS_WPCOM ) {

• jetpack/extensions/blocks/mailchimp/mailchimp.php

  Line 55 in ebec0a8

  $blog_id = ( defined( 'IS_WPCOM' ) && IS_WPCOM )

• jetpack/modules/simple-payments/simple-payments.php

  Line 113 in da783cc

  if ( defined( 'IS_WPCOM' ) && IS_WPCOM ) {

• jetpack/_inc/lib/class-jetpack-tweetstorm-helper.php

  Line 1677 in 9a43739

  $site_id = $is_wpcom ? get_current_blog_id() : Jetpack_Options::get_option( 'id' );