Changeset 762579

Timestamp:

08/26/2013 07:58:40 PM (13 years ago)

Author:

tmoorewp

Message:

Subscriptions: Send the remote user address with the subscription request for spam checking. Also kill the extract.

File:

• jetpack/trunk/modules/subscriptions.php (modified) (5 diffs)

jetpack/trunk/modules/subscriptions.php

@@ -283 +283 @@
      *  unknown_status  : strange error.  Jetpack servers at WordPress.com returned something I didn't understand.
      */
-    function subscribe( $email, $post_ids = 0, $async = true ) {
+    function subscribe( $email, $post_ids = 0, $async = true ) {
         if ( !is_email( $email ) ) {
             return new Jetpack_Error( 'invalid_email' );
@@ -302 +302 @@
 
             if ( $async ) {
-                Jetpack::xmlrpc_async_call( 'jetpack.subscribeToSite', $email, $post_id );
+                Jetpack::xmlrpc_async_call( 'jetpack.subscribeToSite', $email, $post_id );
             } else {
-                $xml->addCall( 'jetpack.subscribeToSite', $email, $post_id );
+                $xml->addCall( 'jetpack.subscribeToSite', $email, $post_id );
             }
         }
@@ -386 +386 @@
         }
 
-        $subscribe = Jetpack_Subscriptions::subscribe( $_REQUEST['email'], 0, false );
+        $subscribe = Jetpack_Subscriptions::subscribe( $_REQUEST['email'], 0, false );
 
         if ( is_wp_error( $subscribe ) ) {
@@ -530 +530 @@
         global $current_user;
 
-        $source = 'widget';
-
-        extract( $args );
-
+        $source                 = 'widget';
         $instance               = wp_parse_args( (array) $instance, $this->defaults() );
         $title                  = isset( $instance['title'] )               ? stripslashes( $instance['title'] )               : '';
@@ -596 +593 @@
                 <input type="hidden" name="sub-type" value="<?php echo esc_attr( $source ); ?>" />
                 <input type="hidden" name="redirect_fragment" value="<?php echo esc_attr( $widget_id ); ?>" />
-                <?php
+                <?php
                     if ( is_user_logged_in() ) {
-                        wp_nonce_field( 'blogsub_subscribe_'. get_current_blog_id(), '_wpnonce', false );
+                        wp_nonce_field( 'blogsub_subscribe_'. get_current_blog_id(), '_wpnonce', false );
                     }
                 ?>