Update plugin jetpack to 4.1.1

3 files changed, 21 insertions, 2 deletions

diff --git a/plugins/jetpack/3rd-party/3rd-party.php b/plugins/jetpack/3rd-party/3rd-party.php
index 6ba6a189..2bab75b8 100644
--- a/plugins/jetpack/3rd-party/3rd-party.php
+++ b/plugins/jetpack/3rd-party/3rd-party.php
@@ -10,3 +10,4 @@ require_once( JETPACK__PLUGIN_DIR . '3rd-party/wpml.php' );
 require_once( JETPACK__PLUGIN_DIR . '3rd-party/bitly.php' );
 require_once( JETPACK__PLUGIN_DIR . '3rd-party/bbpress.php' );
 require_once( JETPACK__PLUGIN_DIR . '3rd-party/woocommerce.php' );
+require_once( JETPACK__PLUGIN_DIR . '3rd-party/vaultpress.php' );
diff --git a/plugins/jetpack/3rd-party/bitly.php b/plugins/jetpack/3rd-party/bitly.php
index 9d087b77..eeca3b7f 100644
--- a/plugins/jetpack/3rd-party/bitly.php
+++ b/plugins/jetpack/3rd-party/bitly.php
@@ -7,7 +7,10 @@
 if( class_exists( 'Bitly' ) ) {
 
 	if( isset( $GLOBALS['bitly'] ) ) {
-		remove_action( 'wp_head', array( $GLOBALS['bitly'], 'og_tags' ) );
+		if ( method_exists( $GLOBALS['bitly'], 'og_tags' ) ) {
+			remove_action( 'wp_head', array( $GLOBALS['bitly'], 'og_tags' ) );
+		}
+		
 		add_action( 'wp_head', 'jetpack_bitly_og_tag', 100 );
 	}
 
@@ -21,7 +24,9 @@ if( class_exists( 'Bitly' ) ) {
 function jetpack_bitly_og_tag() {
 	if( has_filter( 'wp_head', 'jetpack_og_tags') === false ) {
 		// Add the bitly part again back if we don't have any jetpack_og_tags added
-		$GLOBALS['bitly']->og_tags();
+		if ( method_exists( $GLOBALS['bitly'], 'og_tags' ) ) {
+			$GLOBALS['bitly']->og_tags();
+		}
 	} elseif ( isset( $GLOBALS['posts'] ) && $GLOBALS['posts'][0]->ID > 0 ) {
 		printf(  "<meta property=\"bitly:url\" content=\"%s\" /> \n", esc_attr( $GLOBALS['bitly']->get_bitly_link_for_post_id( $GLOBALS['posts'][0]->ID ) ) );
 	}
diff --git a/plugins/jetpack/3rd-party/vaultpress.php b/plugins/jetpack/3rd-party/vaultpress.php
new file mode 100644
index 00000000..d2c1374c
--- /dev/null
+++ b/plugins/jetpack/3rd-party/vaultpress.php
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * For backward compatibility with VaultPress 1.8.3 to play nicely with Jetpack 4.1
+ */
+add_action( 'init', 'jetpack_vaultpress_sync_options' );
+function jetpack_vaultpress_sync_options() {
+	if ( ! class_exists( 'VaultPress' ) ) {
+		return;
+	}
+	$vaultpress = VaultPress::init();
+	Jetpack_Sync::sync_options( __FILE__, $vaultpress->auto_register_option, $vaultpress->option_name );
+}