dont normalise OpenID URLs and fallback to https if no protocol is specified
This commit is contained in:
parent
178b7eba1b
commit
8367cadeef
|
@ -44,7 +44,7 @@ function profile_init(&$a) {
|
|||
if(x($a->profile,'openidserver'))
|
||||
$a->page['htmlhead'] .= '<link rel="openid.server" href="' . $a->profile['openidserver'] . '" />' . "\r\n";
|
||||
if(x($a->profile,'openid')) {
|
||||
$delegate = ((strstr($a->profile['openid'],'://')) ? $a->profile['openid'] : 'http://' . $a->profile['openid']);
|
||||
$delegate = ((strstr($a->profile['openid'],'://')) ? $a->profile['openid'] : 'https://' . $a->profile['openid']);
|
||||
$a->page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\r\n";
|
||||
}
|
||||
// site block
|
||||
|
|
|
@ -474,7 +474,7 @@ function settings_post(&$a) {
|
|||
$str_contact_deny = perms2str($_POST['contact_deny']);
|
||||
|
||||
$openidserver = $a->user['openidserver'];
|
||||
$openid = normalise_openid($openid);
|
||||
//$openid = normalise_openid($openid);
|
||||
|
||||
// If openid has changed or if there's an openid but no openidserver, try and discover it.
|
||||
|
||||
|
@ -1002,7 +1002,7 @@ function settings_content(&$a) {
|
|||
$openid_field = false;
|
||||
}
|
||||
else {
|
||||
$openid_field = array('openid_url', t('OpenID:'),$openid, t("\x28Optional\x29 Allow this OpenID to login to this account."));
|
||||
$openid_field = array('openid_url', t('OpenID:'),$openid, t("\x28Optional\x29 Allow this OpenID to login to this account."), "", "", "url");
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue