wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 0.7.x

Browse Source 
Conflicts:
	README
	lib/router.php
This commit is contained in:
Evan Prodromou 2009-03-31 10:14:54 -04:00
commit c2e6fb668d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/openid.php
View File

@ -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()) {

4
lib/util.php
View File

@ -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