Merge branch '0.9.x' into 1.0.x

[quix0rs-gnu-social.git] / lib / util.php

diff --git a/lib/util.php b/lib/util.php
index f5077f6011e96ef33f872aa7ceac78886a38ad45..5094b2712644d066a2730f0f91c3e3d886f87f95 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -342,7 +342,8 @@ function common_set_cookie($key, $value, $expiration=0)
                      $value,
                      $expiration,
                      $cookiepath,
-                     $server);
+                     $server,
+                     common_config('site', 'ssl')=='always');
 }
 
 define('REMEMBERME', 'rememberme');