Merge branch '0.9.x' into 1.0.x

2010-10-28 16:26:34 -07:00
parent 1851933c34 9e516ed1bb
commit b26eccf33c
958 changed files with 20496 additions and 13020 deletions
--- 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');