git.gnu.io has moved to IP address 209.51.188.249 -- please double check where you are logging in.

Commit 57f78dc6 authored by mmn's avatar mmn

Merge branch 'master' of git.gnu.io:gnu/gnu-social

parents 388655d1 6679ecb9
...@@ -287,7 +287,7 @@ class OpenidsettingsAction extends SettingsAction ...@@ -287,7 +287,7 @@ class OpenidsettingsAction extends SettingsAction
// TRANS: Form validation error for a non-existing OpenID. // TRANS: Form validation error for a non-existing OpenID.
throw new ClientException(_m('No such OpenID.')); throw new ClientException(_m('No such OpenID.'));
} }
if ($this->scoped->getID() !== $oid->user_id) { if ($this->scoped->getID() != $oid->user_id) {
// TRANS: Form validation error if OpenID is connected to another user. // TRANS: Form validation error if OpenID is connected to another user.
throw new ClientException(_m('That OpenID does not belong to you.')); throw new ClientException(_m('That OpenID does not belong to you.'));
} }
......
...@@ -131,6 +131,7 @@ function oid_check_immediate($openid_url, $backto=null) ...@@ -131,6 +131,7 @@ function oid_check_immediate($openid_url, $backto=null)
function oid_authenticate($openid_url, $returnto, $immediate=false) function oid_authenticate($openid_url, $returnto, $immediate=false)
{ {
$openid_url = Auth_OpenID::normalizeUrl($openid_url);
if (!common_valid_http_url($openid_url)) { if (!common_valid_http_url($openid_url)) {
throw new ClientException(_m('No valid URL provided for OpenID.')); throw new ClientException(_m('No valid URL provided for OpenID.'));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment