Changeset 1020343

Timestamp:

11/05/2014 04:11:04 PM (10 years ago)

Author:

eoigal

Message:

Add an action to auto activate/connect akismet key using the jetpack connected wordpress.com account

File:

• akismet/trunk/class.akismet-admin.php (modified) (4 diffs)

akismet/trunk/class.akismet-admin.php

@@ -38 +38 @@
         add_action( 'wp_ajax_comment_author_deurl', array( 'Akismet_Admin', 'remove_comment_author_url' ) );
         add_action( 'wp_ajax_comment_author_reurl', array( 'Akismet_Admin', 'add_comment_author_url' ) );
+
 
         add_filter( 'plugin_action_links', array( 'Akismet_Admin', 'plugin_action_links' ), 10, 2 );
@@ -654 +655 @@
     }
     
-    public static function verify_wpcom_key( $api_key, $user_id, $token = '' ) {
-        $akismet_account = Akismet::http_post( Akismet::build_query( array(
+    public static function verify_wpcom_key( $api_key, $user_id, $ ) {
+        $akismet_account = Akismet::http_post( Akismet::build_query( array(
             'user_id'          => $user_id,
             'api_key'          => $api_key,
-            'token'            => $token,
             'get_account_type' => 'true'
-        ) ), 'verify-wpcom-key' );
+        ) ), 'verify-wpcom-key' );
 
         if ( ! empty( $akismet_account[1] ) )
@@ -668 +668 @@
         
         return $akismet_account;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 
@@ -724 +740 @@
         
         if ( isset( $_GET['token'] ) && preg_match('/^(\d+)-[0-9a-f]{20}$/', $_GET['token'] ) )
-            $akismet_user = self::verify_wpcom_key( '', '', $_GET['token'] );
+            $akismet_user = self::verify_wpcom_key( '', '',  );
         elseif ( $jetpack_user = self::get_jetpack_user() )
             $akismet_user = self::verify_wpcom_key( $jetpack_user['api_key'], $jetpack_user['user_id'] );