mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-39203-master' of git://github.com/FMCorz/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2013-04-18 08:50:29 +01:00
commit 5ca1899e6e
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/oauthlib.php
View File

@ -264,6 +264,8 @@ class oauth_helper {
$this->sign_secret = $this->consumer_secret.'&'.$secret;
$params = $this->prepare_oauth_parameters($this->access_token_api, array('oauth_token'=>$token, 'oauth_verifier'=>$verifier), 'POST');
$this->setup_oauth_http_header($params);
// Should never send the callback in this request.
unset($params['oauth_callback']);
$content = $this->http->post($this->access_token_api, $params, $this->http_options);
$keys = $this->parse_result($content);
$this->set_access_token($keys['oauth_token'], $keys['oauth_token_secret']);

2
repository/dropbox/lib.php
View File

@ -90,7 +90,7 @@ class repository_dropbox extends repository {
'oauth_consumer_key'=>$this->dropbox_key,
'oauth_consumer_secret'=>$this->dropbox_secret,
'oauth_callback' => $callbackurl->out(false),
'api_root' => 'https://www.dropbox.com/1/oauth',
'api_root' => 'https://api.dropbox.com/1/oauth',
);
$this->dropbox = new dropbox($args);