diff options
| -rw-r--r-- | includes/openid.php | 2 | ||||
| -rw-r--r-- | pages/login.php | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/includes/openid.php b/includes/openid.php index 85af9a8..d0e656f 100644 --- a/includes/openid.php +++ b/includes/openid.php @@ -349,7 +349,7 @@ class LightOpenID $headers = $this->request($url, 'HEAD'); $next = false; - if (isset($headers['x-xrds-location'])) { + if (isset($headers['x-xrds-location']) && !isset($this->data['openid_claimed_id'])) { $url = $this->build_url(parse_url($url), parse_url(trim($headers['x-xrds-location']))); $next = true; } diff --git a/pages/login.php b/pages/login.php index e5ccda8..d277cb7 100644 --- a/pages/login.php +++ b/pages/login.php @@ -52,10 +52,8 @@ try { $display = 'noname';
}
$email = $openIdAttributes['contact/email'];
- //$claimedid = $openid->__get('identity');
- // Yahoo fix:
- $claimedid = $openid->__get('openid_identity');
-
+ $claimedid = $openid->__get('identity');
+
if ($claimedid == "https://open.login.yahooapis.com/openid20/user_profile/xrds") {
die(throwLoginError($openIdAttributes, "Yahoo went full retard, and didn't send any way for me to identify you..."));
}
|