Merge pull request #975 from MrPetovan/bug/8511-lib-oauth1-token-parameter
[various] Move optional token parameter at the end of OAuthRequest::from_consumer_and_token() function definitionpull/977/head
commit
d108ea4b79
|
@ -236,7 +236,7 @@ class TwitterOAuth
|
||||||
$url = "{$this->host}{$url}.{$this->format}";
|
$url = "{$this->host}{$url}.{$this->format}";
|
||||||
}
|
}
|
||||||
|
|
||||||
$request = OAuthRequest::from_consumer_and_token($this->consumer, $this->token, $method, $url, $parameters);
|
$request = OAuthRequest::from_consumer_and_token($this->consumer, $method, $url, $parameters, $this->token);
|
||||||
$request->sign_request($this->sha1_method, $this->consumer, $this->token);
|
$request->sign_request($this->sha1_method, $this->consumer, $this->token);
|
||||||
switch ($method) {
|
switch ($method) {
|
||||||
case 'GET':
|
case 'GET':
|
||||||
|
|
|
@ -234,7 +234,7 @@ class TumblrOAuth
|
||||||
$url = "{$this->host}{$url}";
|
$url = "{$this->host}{$url}";
|
||||||
}
|
}
|
||||||
|
|
||||||
$request = OAuthRequest::from_consumer_and_token($this->consumer, $this->token, $method, $url, $parameters);
|
$request = OAuthRequest::from_consumer_and_token($this->consumer, $method, $url, $parameters, $this->token);
|
||||||
$request->sign_request($this->sha1_method, $this->consumer, $this->token);
|
$request->sign_request($this->sha1_method, $this->consumer, $this->token);
|
||||||
switch ($method) {
|
switch ($method) {
|
||||||
case 'GET':
|
case 'GET':
|
||||||
|
|
Loading…
Reference in New Issue