Changeset 814893

Timestamp:

12/04/2013 02:31:16 PM (11 years ago)

Author:

jshreve

Message:

Jetpack 2.7 Beta 1
Add Google+ Publicize

Location:

jetpack/trunk

Files:

• jetpack.php (modified) (2 diffs)
• modules/publicize/assets/publicize-google-2x.png (added)
• modules/publicize/publicize-jetpack.php (modified) (4 diffs)

jetpack/trunk/jetpack.php

@@ -6 +6 @@
  * Description: Bring the power of the WordPress.com cloud to your self-hosted WordPress. Jetpack enables you to connect your blog to a WordPress.com account to use the powerful features normally only available to WordPress.com users.
  * Author: Automattic
- * Version: 2.7-alpha
+ * Version: 2.7-
  * Author URI: http://jetpack.me
  * License: GPL2+
@@ -18 +18 @@
 defined( 'JETPACK_CLIENT__AUTH_LOCATION' ) or define( 'JETPACK_CLIENT__AUTH_LOCATION', 'header' );
 defined( 'JETPACK_CLIENT__HTTPS' ) or define( 'JETPACK_CLIENT__HTTPS', 'AUTO' );
-define( 'JETPACK__VERSION', '2.7-alpha' );
+define( 'JETPACK__VERSION', '2.7-' );
 define( 'JETPACK__PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
 defined( 'JETPACK__GLOTPRESS_LOCALES_PATH' ) or define( 'JETPACK__GLOTPRESS_LOCALES_PATH', JETPACK__PLUGIN_DIR . 'locales.php' );

jetpack/trunk/modules/publicize/publicize-jetpack.php

@@ -13 +13 @@
         add_action( 'wp_ajax_publicize_linkedin_options_page', array( $this, 'options_page_linkedin' ) );
         add_action( 'wp_ajax_publicize_path_options_page', array( $this, 'options_page_path' ) );
+
 
         add_action( 'wp_ajax_publicize_tumblr_options_save', array( $this, 'options_save_tumblr' ) );
@@ -19 +20 @@
         add_action( 'wp_ajax_publicize_linkedin_options_save', array( $this, 'options_save_linkedin' ) );
         add_action( 'wp_ajax_publicize_path_options_save', array( $this, 'options_save_path' ) );
+
 
         add_action( 'load-settings_page_sharing', array( $this, 'force_user_connection' ) );
@@ -292 +294 @@
 
         $services = array(
-                'facebook' => array(),
-                'twitter'  => array(),
-                'linkedin' => array(),
-                'tumblr'   => array(),
-                'path'     => array(),
+                'facebook'        => array(),
+                'twitter'         => array(),
+                'linkedin'        => array(),
+                'tumblr'          => array(),
+                'path'            => array(),
+                'google_plus'     => array(),
         );
 
@@ -614 +617 @@
     function options_page_linkedin() { Publicize_UI::options_page_other( 'linkedin' ); }
     function options_page_path() { Publicize_UI::options_page_other( 'path' ); }
+
 
     function options_save_twitter() { $this->options_save_other( 'twitter' ); }
     function options_save_linkedin() { $this->options_save_other( 'linkedin' ); }
     function options_save_path() { $this->options_save_other( 'path' ); }
+
 
     function options_save_other( $service_name ) {