Browse Source

Fixed misplaced parameter call order on Consumer's redirect() method. Fix is backwards compatible if needed. Fixes ZF-10295

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@23078 44c647ce-9c0f-0410-b52a-842ac1e357ba
padraic 15 years ago
parent
commit
dc54f9d3ae
1 changed files with 7 additions and 1 deletions
  1. 7 1
      library/Zend/Oauth/Consumer.php

+ 7 - 1
library/Zend/Oauth/Consumer.php

@@ -152,14 +152,20 @@ class Zend_Oauth_Consumer extends Zend_Oauth
      * Sends headers and exit()s on completion.
      *
      * @param  null|array $customServiceParameters
+     * @param  null|Zend_Oauth_Token_Request $token
      * @param  null|Zend_Oauth_Http_UserAuthorization $request
      * @return void
      */
     public function redirect(
         array $customServiceParameters = null,
+        Zend_Oauth_Token_Request $token = null,
         Zend_Oauth_Http_UserAuthorization $request = null
     ) {
-        $redirectUrl = $this->getRedirectUrl($customServiceParameters, $request);
+        if ($token instanceof Zend_Oauth_Http_UserAuthorization) {
+            $request = $token;
+            $token = null;
+        }
+        $redirectUrl = $this->getRedirectUrl($customServiceParameters, $token, $request);
         header('Location: ' . $redirectUrl);
         exit(1);
     }