diff options
author | Lilli <lilli@janrain.com> | 2010-04-28 13:37:18 -0700 |
---|---|---|
committer | Lilli <lilli@janrain.com> | 2010-04-28 13:37:18 -0700 |
commit | 1a2414c6cd0e28ddaae541b97caff07c54201414 (patch) | |
tree | 33912fa0fc7856d0a3e5013b83a2604017d29d95 /Auth/OpenID/Server.php | |
parent | a4c839b62dbfc2a434121a487b092c45494e0fb6 (diff) | |
download | php-openid-1a2414c6cd0e28ddaae541b97caff07c54201414.zip php-openid-1a2414c6cd0e28ddaae541b97caff07c54201414.tar.gz php-openid-1a2414c6cd0e28ddaae541b97caff07c54201414.tar.bz2 |
Added ccazette/indeyet's change to function returnToVerified() manually as the commit was failing as when I tried to pull the change. This fixes the issue opened by ccazette: 'In Server.php, this function calls the Auth_OpenID_verifyReturnTo() function from TrustRoot.php, which takes 3 arguments, but only 2 are given in call_user_func_array.'
Diffstat (limited to 'Auth/OpenID/Server.php')
-rw-r--r-- | Auth/OpenID/Server.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Auth/OpenID/Server.php b/Auth/OpenID/Server.php index e1011df..065d529 100644 --- a/Auth/OpenID/Server.php +++ b/Auth/OpenID/Server.php @@ -817,10 +817,11 @@ class Auth_OpenID_CheckIDRequest extends Auth_OpenID_Request { */ function returnToVerified() { + $fetcher = Auth_Yadis_Yadis::getHTTPFetcher(); return call_user_func_array($this->verifyReturnTo, - array($this->trust_root, $this->return_to)); + array($this->trust_root, $this->return_to, $fetcher)); } - + static function fromMessage(&$message, $server) { $mode = $message->getArg(Auth_OpenID_OPENID_NS, 'mode'); |