GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

Browse Source 
strk's OpenID fix
This commit is contained in:
Mikael Nordfeldth 2017-04-06 11:15:37 +02:00
commit bc1f8b5db6
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/OpenID/actions/openidsettings.php
View File

@ -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->getID()) { 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.'));
} }

1
plugins/OpenID/openid.php
View File

@ -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.'));
} }