Implemented patch by Ryan Boyd to enable Two-Legged OAuth for Zend_Oauth - implements ZF-9284

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@21232 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Oauth/Http/Utility.php

@@ -52,9 +52,13 @@ class Zend_Oauth_Http_Utility
             'oauth_nonce'            => $this->generateNonce(),
             'oauth_signature_method' => $config->getSignatureMethod(),
             'oauth_timestamp'        => $this->generateTimestamp(),
-            'oauth_token'            => $config->getToken()->getToken(),
             'oauth_version'          => $config->getVersion(),
         );
+        
+        if ($config->getToken()->getToken() != null) {
+            $params['oauth_token'] = $config->getToken()->getToken();
+        }
+
 
         if (!is_null($serviceProviderParams)) {
             $params = array_merge($params, $serviceProviderParams);

tests/Zend/Oauth/Oauth/Token/AccessTest.php

@@ -79,7 +79,7 @@ class Zend_Oauth_Token_AccessTest extends PHPUnit_Framework_TestCase
             'http://www.example.com',
             new Test_Config_90244
         );
-        $this->assertEquals('OAuth realm="",oauth_consumer_key="1234567890",oauth_nonce="e807f1fcf82d132f9bb018ca6738a19f",oauth_signature_method="HMAC-SHA1",oauth_timestamp="12345678901",oauth_token="abcde",oauth_version="1.0",oauth_signature="6fb42da0e32e07b61c9f0251fe627a9c"', $value);
+        $this->assertEquals('OAuth realm="",oauth_consumer_key="1234567890",oauth_nonce="e807f1fcf82d132f9bb018ca6738a19f",oauth_signature_method="HMAC-SHA1",oauth_timestamp="12345678901",oauth_version="1.0",oauth_token="abcde",oauth_signature="6fb42da0e32e07b61c9f0251fe627a9c"', $value);
     }
 
 }
@@ -107,4 +107,4 @@ class Test_Config_90244 extends Zend_Oauth_Config
         return $token;}
     public function getRequestMethod() 
     {return 'POST';}
-}
+}