diff options
| author | czaks <marcin@6irc.net> | 2014-06-11 02:05:14 +0200 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2014-06-11 02:05:14 +0200 |
| commit | 503903ac0f1ccbc104366834462377c98f64f6bb (patch) | |
| tree | a7fba77c4fe6f46a3a95ed48aeb1bc55b8cbd480 | |
| parent | e27c923b79e3d6d0817941bd3d7ca91576483397 (diff) | |
| parent | 23d6e8203806bba22b6444cd09e53da9fc7c501a (diff) | |
Merge 4.5
| -rw-r--r-- | inc/mod/auth.php | 4 | ||||
| -rw-r--r-- | inc/mod/pages.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/inc/mod/auth.php b/inc/mod/auth.php index 697d06a1..182f3ee2 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, $_SERVER['HTTPS'], $config['cookies']['httponly']); + time() + $config['cookies']['expire'], $config['cookies']['jail'] ? $config['cookies']['path'] : '/', null, isset($_SERVER['HTTPS']) && $_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, $_SERVER['HTTPS'], true); + setcookie($config['cookies']['mod'], 'deleted', time() - $config['cookies']['expire'], $config['cookies']['jail']?$config['cookies']['path'] : '/', null, isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'], true); } function modLog($action, $_board=null) { diff --git a/inc/mod/pages.php b/inc/mod/pages.php index d340dc44..7c236ba4 100644 --- a/inc/mod/pages.php +++ b/inc/mod/pages.php @@ -150,7 +150,7 @@ function mod_dashboard() { $latest = false; } - setcookie('update', serialize($latest), time() + $config['check_updates_time'], $config['cookies']['jail'] ? $config['cookies']['path'] : '/', null, $_SERVER['HTTPS'], true); + setcookie('update', serialize($latest), time() + $config['check_updates_time'], $config['cookies']['jail'] ? $config['cookies']['path'] : '/', null, isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'], true); } if ($latest) |