diff options
| author | czaks <marcin@6irc.net> | 2014-06-10 17:51:03 +0200 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2014-06-10 17:51:03 +0200 |
| commit | c2cbbe7e225ba74ea5fd033d4672286ceb1e429c (patch) | |
| tree | 0f81cf4182c0f81c28d2d54b13ec79a1d151d364 /inc/mod/auth.php | |
| parent | c04b4196394b68a1a2105ebc8011460826f56c34 (diff) | |
| parent | 2f55cd9897253213c862f1ae36766ebeb74b7c58 (diff) | |
Merge 4.5
Conflicts:
js/expand-too-long.js
Diffstat (limited to 'inc/mod/auth.php')
| -rw-r--r-- | inc/mod/auth.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/mod/auth.php b/inc/mod/auth.php index f2003dfe..697d06a1 100644 --- a/inc/mod/auth.php +++ b/inc/mod/auth.php @@ -69,13 +69,13 @@ function setCookies() { $mod['hash'][0] . // password ':' . $mod['hash'][1], // salt - time() + $config['cookies']['expire'], $config['cookies']['jail'] ? $config['cookies']['path'] : '/', null, false, $config['cookies']['httponly']); + time() + $config['cookies']['expire'], $config['cookies']['jail'] ? $config['cookies']['path'] : '/', null, $_SERVER['HTTPS'], $config['cookies']['httponly']); } function destroyCookies() { global $config; // Delete the cookies - setcookie($config['cookies']['mod'], 'deleted', time() - $config['cookies']['expire'], $config['cookies']['jail']?$config['cookies']['path'] : '/', null, false, true); + setcookie($config['cookies']['mod'], 'deleted', time() - $config['cookies']['expire'], $config['cookies']['jail']?$config['cookies']['path'] : '/', null, $_SERVER['HTTPS'], true); } function modLog($action, $_board=null) { |