Merge pull request #25 from MarkoVcode/master

Again update of OAuthSimple.php
jrconlin · Jan 13, 2015 · 9d5715a · 9d5715a
2 parents b250946 + 258c956
commit 9d5715a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/php/OAuthSimple.php b/php/OAuthSimple.php
@@ -490,8 +490,8 @@ private function _generateSignature ($parameters="")
 		{
             $secretKey .= self::_oauthEscape($this->_secrets['oauth_secret']);
         }
-        if(empty($parameters)){
-            $parameters = $this->_normalizedParameters();
+        if(!empty($parameters)){
+            $parameters = urlencode($parameters);
         }
         switch($this->_parameters['oauth_signature_method'])
         {

diff --git a/python/OAuthSimple/OAuthSimple.py b/python/OAuthSimple/OAuthSimple.py
@@ -236,7 +236,7 @@ def _generateSignature(self, normParamString):
         elif (self._parameters['oauth_signature_method'] == 'HMAC-SHA1'):
             self.sbs = '&'.join([self._oauthEscape(self._action),
                                 self._oauthEscape(self._path),
-                                normParamString])
+                                self._oauthEscape(normParamString)])
         return base64.b64encode(hmac.new(secretKey,
                                 self.sbs,
                                 hashlib.sha1).digest())