From 1a2414c6cd0e28ddaae541b97caff07c54201414 Mon Sep 17 00:00:00 2001
From: Lilli <lilli@janrain.com>
Date: Wed, 28 Apr 2010 13:37:18 -0700
Subject: 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.'

---
 Auth/OpenID/Server.php | 5 +++--
 1 file 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');
-- 
cgit v1.1