Changeset 945782 for jetpack/trunk/modules/sharedaddy/sharing.php

Timestamp:

07/09/2014 07:57:26 PM (12 years ago)

Author:

enej

Message:

Jetpack: Updating trunk to 3.1-beta1

File:

• jetpack/trunk/modules/sharedaddy/sharing.php (modified) (2 diffs)

jetpack/trunk/modules/sharedaddy/sharing.php

@@ -25 +25 @@
     public function sharing_head() {
         wp_enqueue_script( 'sharing-js', WP_SHARING_PLUGIN_URL.'admin-sharing.js', array( 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-form' ), 2 );
-        wp_enqueue_style( 'sharing-admin', WP_SHARING_PLUGIN_URL.'admin-sharing.css', false, JETPACK__VERSION );
-        wp_enqueue_style( 'sharing', WP_SHARING_PLUGIN_URL.'sharing.css', false, JETPACK__VERSION );
-        wp_enqueue_style( 'genericons' );
+
+        // @todo: Remove this opt-out filter in the future
+        if ( ( ! defined( 'IS_WPCOM' ) ) || ( ! IS_WPCOM ) || apply_filters( 'wpl_sharing_2014_1', true ) ) {
+            wp_enqueue_style( 'sharing-admin', WP_SHARING_PLUGIN_URL.'admin-sharing.css', false, JETPACK__VERSION );
+            wp_enqueue_style( 'sharing', WP_SHARING_PLUGIN_URL.'sharing.css', false, JETPACK__VERSION );
+            wp_enqueue_style( 'genericons' );
+        } else {
+            wp_enqueue_style( 'sharing-admin', WP_SHARING_PLUGIN_URL.'admin-sharing-legacy.css', false, JETPACK__VERSION );
+            wp_enqueue_style( 'sharing', WP_SHARING_PLUGIN_URL.'sharing-legacy.css', false, JETPACK__VERSION );
+        }
+
         wp_enqueue_script( 'sharing-js-fe', WP_SHARING_PLUGIN_URL . 'sharing.js', array( ), 3 );
 
@@ -159 +167 @@
             echo '<div class="updated"><p>'.__( 'Settings have been saved', 'jetpack' ).'</p></div>';
 
-        if( !isset( $global['sharing_label'] ) || '' == $global['sharing_label']  ) {
+        if( !isset( $global['sharing_label'] ) ) {
             $global['sharing_label'] = __( 'Share this:', 'jetpack' );
         }