Changeset 603548

Timestamp:

09/25/2012 10:36:37 AM (13 years ago)

Author:

daniloercoli

Message:

jetpack: merge mobile push notifications branch into trunk.

Location:

jetpack/trunk

Files:

• jetpack.php (modified) (2 diffs)
• modules/subscriptions.php (modified) (1 diff)

jetpack/trunk/jetpack.php

@@ -192 +192 @@
         add_action( 'jetpack_clean_nonces', array( $this, 'clean_nonces' ) );
 
+        add_filter( 'xmlrpc_blog_options', array( $this, 'xmlrpc_options' ) );
+        
         add_action( 'admin_menu', array( $this, 'admin_menu' ) );
         add_action( 'admin_init', array( $this, 'admin_init' ) );
@@ -2588 +2590 @@
         return $methods;
     }
+    
+    function xmlrpc_options( $options ) {
+        $options['jetpack_version'] = array(
+                'desc'          => __( 'Jetpack Plugin Version' ),
+                'readonly'      => true,
+                'value'         => JETPACK__VERSION,
+        );
+    
+        $options['jetpack_client_id'] = array(
+                'desc'          => __( 'The Client ID/WP.com Blog ID of this site' ),
+                'readonly'      => true,
+                'value'         => $this->get_option( 'id' ),
+        );
+        return $options;
+    }
 
     function clean_nonces( $all = false ) {

jetpack/trunk/modules/subscriptions.php

@@ -128 +128 @@
         }
 
-        if ( 1 == $comment->comment_approved ) {
-            $this->jetpack->sync->comment( $id );
-        }
+        if ( 'spam' === $comment->comment_approved ) {
+            return;
+        }
+        
+        $this->jetpack->sync->comment( $id );
     }