[project @ Fix Auth_OpenID_Message::getAliasedArg for ns.ALIAS arguments]

2 files changed, 11 insertions, 5 deletions

diff --git a/Auth/OpenID/Consumer.php b/Auth/OpenID/Consumer.php
index a4b7a59..af52137 100644
--- a/Auth/OpenID/Consumer.php
+++ b/Auth/OpenID/Consumer.php
@@ -1322,13 +1322,12 @@ class Auth_OpenID_GenericConsumer {
                     continue;
                 }
 
-                if (!$message->hasKey(Auth_OpenID_OPENID_NS,
-                                      $k)) {
+                $value = $message->getAliasedArg($k);
+                if ($value === null) {
                     return null;
                 }
 
-                $val = $message->getAliasedArg($k);
-                $check_args[$k] = $val;
+                $check_args[$k] = $value;
             }
         }
 
diff --git a/Auth/OpenID/Message.php b/Auth/OpenID/Message.php
index 6bfc5f8..8a02ab2 100644
--- a/Auth/OpenID/Message.php
+++ b/Auth/OpenID/Message.php
@@ -873,7 +873,14 @@ class Auth_OpenID_Message {
             $ns = null;
         } else {
             list($alias, $key) = $parts;
-            $ns = $this->namespaces->getNamespaceURI($alias);
+
+            if ($alias == 'ns') {
+              // Return the namespace URI for a namespace alias
+              // parameter.
+              return $this->namespaces->getNamespaceURI($key);
+            } else {
+              $ns = $this->namespaces->getNamespaceURI($alias);
+            }
         }
 
         if ($ns === null) {