diff options
| author | Brion Vibber <brion@pobox.com> | 2010-10-28 16:26:34 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-10-28 16:26:34 -0700 |
| commit | b26eccf33cf69c04a96d5d6d3eddc0ef68ffd4b1 (patch) | |
| tree | 9d7e6ecfb361b3f9c2149d3b6400ea0d84f9c497 /lib/util.php | |
| parent | 1851933c344307fdbd864489bf6f1a42bf6a6096 (diff) | |
| parent | 9e516ed1bbb7b7a32fce006e5f2915b0ca344b98 (diff) | |
Merge branch '0.9.x' into 1.0.x
Diffstat (limited to 'lib/util.php')
| -rw-r--r-- | lib/util.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/util.php b/lib/util.php index f5077f601..5094b2712 100644 --- 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'); |