Added Mock Jetpack Option to Sync options that don't have to live in the Database

If you want to sync options that don’t live in the database. Before you
had to:
Add the option to be synced to .com by calling the sync_options method.
Add a filter to pre_option_ to fake retrieve it from the db.
Trigger the change unless you want the synced by when
‘sync_all_registered_options’ method is called. Which is daily by
heartbeat and on plugin upgrade.

Now you can use the jetpack_mock_option function that lets you define
the jetpack option and the callback that would  return the output of
it.

Author: enejb

class.jetpack.php

@@ -351,13 +351,7 @@ private function Jetpack() {
 		 * here, before we potentially fail out.
 		 */
 		add_filter( 'jetpack_require_lib_dir', 		array( $this, 'require_lib_dir' ) );
-		/**
-		 * Update the main_network_site on .com
-		 */
-		add_filter( 'pre_option_jetpack_main_network_site', array( $this, 'jetpack_main_network_site_option' ) );
-		add_action( 'update_option_siteurl', 			array( $this, 'update_jetpack_main_network_site_option' ) );
-		// Update jetpack_is_main_network on .com
-		add_filter( 'pre_option_jetpack_is_main_network', array( $this, 'is_main_network_option' ) );
+
 		/*
 		 * Load things that should only be in Network Admin.
 		 *
@@ -384,9 +378,7 @@ private function Jetpack() {
 			'siteurl',
 			'blogname',
 			'gmt_offset',
-			'timezone_string',
-			'jetpack_main_network_site',
-			'jetpack_is_main_network'
+			'timezone_string'
 		);
 
 		add_action( 'update_option', array( $this, 'log_settings_change' ), 10, 3 );
@@ -644,7 +636,7 @@ function require_lib_dir( $lib_dir ) {
 	 * @param  bool $option
 	 * @return string
 	 */
-	function jetpack_main_network_site_option( $option ) {
+	public static function jetpack_main_network_site_option( $option ) {
 		return network_site_url();
 	}
 

functions.jetpack_mock_option.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * Sometimes we need to fake options to be able to sync data with .com
+ * This is a helper function. That will make it easier to do just that.
+ *
+ * It will make sure that the options are synced when
+ * @param  string $option   Option will always be prefixed with Jetpack and be saved on .com side
+ * @param  string or array $callback should never return false. Best to stay way from bool type at all.
+ * @return null
+ */
+function jetpack_mock_option( $option , $callback ) {
+
+		add_filter( 'pre_option_jetpack_'. $option ,  $callback );
+
+		Jetpack_Sync::sync_options( JETPACK__PLUGIN_DIR . 'functions.jetpack_mock_option.php', 'jetpack_' . $option );
+
+}
+
+
+// Update jetpack_is_main_network on .com
+jetpack_mock_option( 'is_main_network',   array( Jetpack::init(), 'is_main_network_option' ) );
+jetpack_mock_option( 'main_network_site', array( Jetpack::init(), 'jetpack_main_network_site_option' ) );
+
+/**
+ * Trigger an update to the main_network_site when we update the blogname of a site.
+ *
+ * @return null
+ */
+add_action( 'update_option_blogname', array( Jetpack::init(), 'update_jetpack_main_network_site_option' ) );
+

jetpack.php

@@ -45,6 +45,7 @@
 require_once( JETPACK__PLUGIN_DIR . 'functions.photon.php'            );
 require_once( JETPACK__PLUGIN_DIR . 'functions.compat.php'            );
 require_once( JETPACK__PLUGIN_DIR . 'functions.gallery.php'           );
+require_once( JETPACK__PLUGIN_DIR . 'functions.jetpack_mock_option.php' );
 require_once( JETPACK__PLUGIN_DIR . 'require-lib.php'                 );
 require_once( JETPACK__PLUGIN_DIR . 'class.jetpack-autoupdate.php'    );