diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-17 19:49:36 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-17 19:49:36 -0700 |
| commit | 7c7a5cba8fe6fd6dc15acc14954d9ba9ed632c00 (patch) | |
| tree | d88838524fa5f6cbf1d072da73eddafd4b752ffb /include/api.php | |
| parent | f0cb3cba124e637fa46143b692dbb561d4ee3ae0 (diff) | |
| parent | 76558df9667b4900b4036faca0075985596b93cd (diff) | |
| download | volse-hubzilla-7c7a5cba8fe6fd6dc15acc14954d9ba9ed632c00.tar.gz volse-hubzilla-7c7a5cba8fe6fd6dc15acc14954d9ba9ed632c00.tar.bz2 volse-hubzilla-7c7a5cba8fe6fd6dc15acc14954d9ba9ed632c00.zip | |
Merge branch 'master' into tres
Diffstat (limited to 'include/api.php')
| -rw-r--r-- | include/api.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/api.php b/include/api.php index 01518bea8..e94266762 100644 --- a/include/api.php +++ b/include/api.php @@ -78,11 +78,14 @@ require_once('include/items.php'); // list($consumer,$token) = $oauth->verify_request(OAuthRequest::from_request()); if (!is_null($token)){ $oauth->loginUser($token->uid); + + $a->set_oauth_key($consumer->key); + call_hooks('logged_in', $a->user); return; } echo __file__.__line__.__function__."<pre>"; - var_dump($consumer, $token); +// var_dump($consumer, $token); die(); } catch(Exception $e) { |