1 files changed, 6 insertions, 14 deletions

diff --git a/plugins/jetpack/modules/publicize/publicize-jetpack.php b/plugins/jetpack/modules/publicize/publicize-jetpack.php
index 8ab8e95c..b2ec20e8 100644
--- a/plugins/jetpack/modules/publicize/publicize-jetpack.php
+++ b/plugins/jetpack/modules/publicize/publicize-jetpack.php
@@ -13,13 +13,11 @@ class Publicize extends Publicize_Base {
 		add_action( 'wp_ajax_publicize_facebook_options_page', array( $this, 'options_page_facebook' ) );
 		add_action( 'wp_ajax_publicize_twitter_options_page', array( $this, 'options_page_twitter' ) );
 		add_action( 'wp_ajax_publicize_linkedin_options_page', array( $this, 'options_page_linkedin' ) );
-		add_action( 'wp_ajax_publicize_google_plus_options_page', array( $this, 'options_page_google_plus' ) );
 
 		add_action( 'wp_ajax_publicize_tumblr_options_save', array( $this, 'options_save_tumblr' ) );
 		add_action( 'wp_ajax_publicize_facebook_options_save', array( $this, 'options_save_facebook' ) );
 		add_action( 'wp_ajax_publicize_twitter_options_save', array( $this, 'options_save_twitter' ) );
 		add_action( 'wp_ajax_publicize_linkedin_options_save', array( $this, 'options_save_linkedin' ) );
-		add_action( 'wp_ajax_publicize_google_plus_options_save', array( $this, 'options_save_google_plus' ) );
 
 		add_action( 'load-settings_page_sharing', array( $this, 'force_user_connection' ) );
 
@@ -117,7 +115,11 @@ class Publicize extends Publicize_Base {
 	}
 
 	function get_all_connections() {
-		return Jetpack_Options::get_option( 'publicize_connections' );
+		$connections = Jetpack_Options::get_option( 'publicize_connections' );
+		if ( isset( $connections['google_plus'] ) ) {
+			unset( $connections['google_plus'] );
+		}
+		return $connections;
 	}
 
 	function get_connections( $service_name, $_blog_id = false, $_user_id = false ) {
@@ -239,12 +241,11 @@ class Publicize extends Publicize_Base {
 	function globalization() {
 		if ( 'on' == $_REQUEST['global'] ) {
 			$globalize_connection = $_REQUEST['connection'];
-
 			if ( ! current_user_can( $this->GLOBAL_CAP ) ) {
 				return;
 			}
 
-			$this->globalize_connection( $connection_id );
+			$this->globalize_connection( $globalize_connection );
 		}
 	}
 
@@ -298,7 +299,6 @@ class Publicize extends Publicize_Base {
 			'twitter'     => array(),
 			'linkedin'    => array(),
 			'tumblr'      => array(),
-			'google_plus' => array(),
 		);
 
 		if ( 'all' == $filter ) {
@@ -674,10 +674,6 @@ class Publicize extends Publicize_Base {
 		Publicize_UI::options_page_other( 'linkedin' );
 	}
 
-	function options_page_google_plus() {
-		Publicize_UI::options_page_other( 'google_plus' );
-	}
-
 	function options_save_twitter() {
 		$this->options_save_other( 'twitter' );
 	}
@@ -686,10 +682,6 @@ class Publicize extends Publicize_Base {
 		$this->options_save_other( 'linkedin' );
 	}
 
-	function options_save_google_plus() {
-		$this->options_save_other( 'google_plus' );
-	}
-
 	function options_save_other( $service_name ) {
 		// Nonce check
 		check_admin_referer( 'save_' . $service_name . '_token_' . $_REQUEST['connection'] );