Skip to content

Commit e09aa7f

Browse files
committed
Merge branch 'release/0.4.1'
2 parents 34f7b94 + db87106 commit e09aa7f

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

lib/Bitbucket/API/Http/Client.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class Client implements ClientInterface
3333
'api_versions' => array('1.0', '2.0'), // supported versions
3434
'format' => 'json',
3535
'formats' => array('json', 'xml'), // supported response formats
36-
'user_agent' => 'bitbucket-api-php/0.4.0 (https://bitbucket.org/gentlero/bitbucket-api)',
36+
'user_agent' => 'bitbucket-api-php/0.4.1 (https://bitbucket.org/gentlero/bitbucket-api)',
3737
'timeout' => 10,
3838
'verify_peer' => false
3939
);

lib/Bitbucket/API/Http/Listener/OAuthListener.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,13 @@ public function postSend(RequestInterface $request, MessageInterface $response)
126126
*/
127127
protected function getParametersToSign(RequestInterface $request)
128128
{
129-
return array_merge($this->getOAuthParameters($request), $this->getContentAsParameters($request));
129+
$params = $this->getOAuthParameters($request);
130+
131+
if ($request->getHeader('Content-Type') === 'application/x-www-form-urlencoded') {
132+
$params = array_merge($params, $this->getContentAsParameters($request));
133+
}
134+
135+
return $params;
130136
}
131137

132138
/**

0 commit comments

Comments
 (0)