diff options
| author | czaks <marcin@6irc.net> | 2014-06-20 23:27:34 +0200 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2014-06-20 23:27:34 +0200 |
| commit | 73177fcffc040d1c225782fe85f09576a39f6890 (patch) | |
| tree | b101f49b4ff3b2b00d20b874abd702bb04ea6220 /inc/mod/pages.php | |
| parent | 9e2b722db6784226b1394ddf957aa9a4a16ac9a9 (diff) | |
| parent | 7933abd271b5bb3578cd80f62302cc6ac8961b91 (diff) | |
Merge branch '4.5' of github.com:vichan-devel/Tinyboard into HEAD
Conflicts:
templates/themes/basic/index.html
Diffstat (limited to 'inc/mod/pages.php')
| -rw-r--r-- | inc/mod/pages.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/mod/pages.php b/inc/mod/pages.php index a247e35c..05a24865 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, false, true); + setcookie('update', serialize($latest), time() + $config['check_updates_time'], $config['cookies']['jail'] ? $config['cookies']['path'] : '/', null, !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off', true); } if ($latest) |