WordPress.org
Get WordPress

Plugin Directory

Changeset 593080


Ignore:
Timestamp:
08/31/2012 05:55:08 PM (13 years ago)
Author:
andy
Message:

jetpack multiuser: add user_login to authorization URL for better user messaging; stop trying to activate modules when only connecting a user.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • jetpack/branches/multiuser/jetpack.php

    r592416 r593080  
    14861486     * 9 - Jetpack_Client_Server::get_token()
    14871487     * 10- GET https://jetpack.wordpress.com/jetpack.token/1/ with
    1488      *     client_id, client_secret, grant_type, code, redirect_uri:action=authorize, state, scope, user_email
     1488     *     client_id, client_secret, grant_type, code, redirect_uri:action=authorize, state, scope, user_email, user_login
    14891489     * 11- which responds with
    14901490     *     access_token, token_type, scope
    … …  
    18821882                'scope' => $signed_role,
    18831883                'user_email' => $user->user_email,
     1884                'user_login' => $user->user_login,
    18841885            ) );
    18851886
    … …  
    30143015            Jetpack::state( 'message', 'authorized' );
    30153016
     3017            if ( ! $is_master_user ) {
     3018                // Don't activate anything since we are just connecting a user.
     3019                break;
     3020            }
     3021
    30163022            if ( $active_modules = Jetpack::get_option( 'active_modules' ) ) {
    30173023                Jetpack::delete_option( 'active_modules' );
Note: See TracChangeset for help on using the changeset viewer.