give the correct root url when SSL enabled
This commit is contained in:
parent
e149f3d64b
commit
1fbf9a042e
|
@ -160,7 +160,7 @@ function oid_authenticate($openid_url, $returnto, $immediate=false)
|
||||||
$auth_request->addExtension($sreg_request);
|
$auth_request->addExtension($sreg_request);
|
||||||
}
|
}
|
||||||
|
|
||||||
$trust_root = common_path('');
|
$trust_root = common_root_url(true);
|
||||||
$process_url = common_local_url($returnto);
|
$process_url = common_local_url($returnto);
|
||||||
|
|
||||||
if ($auth_request->shouldSendRedirect()) {
|
if ($auth_request->shouldSendRedirect()) {
|
||||||
|
|
|
@ -952,9 +952,9 @@ function common_profile_url($nickname)
|
||||||
|
|
||||||
// Should make up a reasonable root URL
|
// Should make up a reasonable root URL
|
||||||
|
|
||||||
function common_root_url()
|
function common_root_url($ssl=false)
|
||||||
{
|
{
|
||||||
return common_path('');
|
return common_path('', $ssl);
|
||||||
}
|
}
|
||||||
|
|
||||||
// returns $bytes bytes of random data as a hexadecimal string
|
// returns $bytes bytes of random data as a hexadecimal string
|
||||||
|
|
Loading…
Reference in New Issue
Block a user