Michel2/oauthsimple
1
0
Fork 0
mirror of https://github.com/jrconlin/oauthsimple.git synced 2026-09-15 02:53:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

changed code to always call set parameters (to make calling simpler)

Browse Source
This commit is contained in:
jrconlin
2010-10-25 10:05:00 -07:00
parent 9cbc4189ef
commit 7def21f2ac
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
php/OAuthSimple.php
+5 -6
View File
@@ -220,7 +220,7 @@ class OAuthSimple {
$this->_parameters['oauth_signature_method']=$method;
break;
default:
throw new OAuthSimpleException ('Unknown signing method specified for OAuthSimple.setSignatureMethod');
throw new OAuthSimpleException ("Unknown signing method $method specified for OAuthSimple.setSignatureMethod");
}
return $this;
}
@@ -243,8 +243,7 @@ class OAuthSimple {
$this->setSignatureMethod($args['method']);
if (!empty($args['signatures']))
$this->setTokensAndSecrets($args['signatures']);
if (!empty($args['parameters']))
$this->setParameters($args['parameters']);
$this->setParameters($args['parameters']);
$normParams = $this->_normalizedParameters();
$this->_parameters['oauth_signature'] = $this->_generateSignature($normParams);
return Array(
@@ -278,15 +277,15 @@ class OAuthSimple {
{
foreach ($pValue as $val)
{
$result .= $pName .'="' . $this->_oauthEscape($val) . '" ';
$result .= $pName .'="' . $this->_oauthEscape($val) . '", ';
}
}
else
{
$result .= $pName . '="' . $this->_oauthEscape($pValue) . '" ';
$result .= $pName . '="' . $this->_oauthEscape($pValue) . '", ';
}
}
return $result;
return preg_replace('/, $/','',$result);
}
// Start private methods. Here be Dragons.