diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-03-31 10:14:54 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-03-31 10:14:54 -0400 |
| commit | c2e6fb668df99e6c6249a6009202db3e305aae71 (patch) | |
| tree | 941751c60cccc411911a5ccb8e043111a1d68320 | |
| parent | e00508d188de053caeb19595b94452973d87da3b (diff) | |
| parent | 1fbf9a042e2e7ed1f67dfad9b7fe3b96019bd1a3 (diff) | |
Merge branch 'master' into 0.7.x
Conflicts:
README
lib/router.php
| -rw-r--r-- | lib/openid.php | 2 | ||||
| -rw-r--r-- | lib/util.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/openid.php b/lib/openid.php index 3aa488b6d..f3769c6fc 100644 --- a/lib/openid.php +++ b/lib/openid.php @@ -160,7 +160,7 @@ function oid_authenticate($openid_url, $returnto, $immediate=false) $auth_request->addExtension($sreg_request); } - $trust_root = common_path(''); + $trust_root = common_root_url(true); $process_url = common_local_url($returnto); if ($auth_request->shouldSendRedirect()) { diff --git a/lib/util.php b/lib/util.php index fdcae0aca..98a3ae844 100644 --- a/lib/util.php +++ b/lib/util.php @@ -952,9 +952,9 @@ function common_profile_url($nickname) // 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 |