give the correct root url when SSL enabled

diff --git a/lib/openid.php b/lib/openid.php
index 3aa488b6d422df9f7d5240da0a9d016fdecdbf91..f3769c6fce01742f3eabfe95ae741d0405e12681 100644 (file)
--- 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 fdcae0aca0e457fd230a9e5dd7adfd8c33394b51..98a3ae8448e50e8eadb5bf90558cc0249041183c 100644 (file)
--- 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