Merge 4.5

This commit is contained in:
czaks 2014-06-11 02:05:14 +02:00
commit 503903ac0f
2 changed files with 3 additions and 3 deletions

View file

@ -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)