[project @ getServerID -> getLocalID]

3 files changed, 4 insertions, 4 deletions

diff --git a/Auth/OpenID/Consumer.php b/Auth/OpenID/Consumer.php
index 35255ea..1e2233d 100644
--- a/Auth/OpenID/Consumer.php
+++ b/Auth/OpenID/Consumer.php
@@ -584,7 +584,7 @@ class Auth_OpenID_GenericConsumer {
                                                    "Missing required field");
         }
 
-        if ($endpoint->getServerID() != $server_id2) {
+        if ($endpoint->getLocalID() != $server_id2) {
             return new Auth_OpenID_FailureResponse($endpoint,
                                              "Server ID (delegate) mismatch");
         }
@@ -989,7 +989,7 @@ class Auth_OpenID_AuthRequest {
 
         $redir_args = array(
             'openid.mode' => $mode,
-            'openid.identity' => $this->endpoint->getServerID(),
+            'openid.identity' => $this->endpoint->getLocalID(),
             'openid.return_to' => $return_to,
             'openid.trust_root' => $trust_root);
 
diff --git a/Auth/OpenID/Discover.php b/Auth/OpenID/Discover.php
index 1390ed6..17845bb 100644
--- a/Auth/OpenID/Discover.php
+++ b/Auth/OpenID/Discover.php
@@ -109,7 +109,7 @@ class Auth_OpenID_ServiceEndpoint {
         }
     }
 
-    function getServerID()
+    function getLocalID()
     {
         // Return the identifier that should be sent as the
         // openid.identity_url parameter to the server.
diff --git a/Tests/Auth/OpenID/Discover.php b/Tests/Auth/OpenID/Discover.php
index b01835c..2afeca5 100644
--- a/Tests/Auth/OpenID/Discover.php
+++ b/Tests/Auth/OpenID/Discover.php
@@ -663,7 +663,7 @@ class Tests_Auth_OpenID_Discover extends _DiscoveryBase {
       $endpoint = new Auth_OpenID_ServiceEndpoint();
       $endpoint->identity_url = "=example";
       $endpoint->canonicalID = Services_Yadis_XRI("=!1000");
-      $this->assertEquals($endpoint->getServerID(), Services_Yadis_XRI("=!1000"));
+      $this->assertEquals($endpoint->getLocalID(), Services_Yadis_XRI("=!1000"));
     }
 }