natto1784/aslichan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 4.5

Browse Source 
Conflicts:
	js/expand-too-long.js
This commit is contained in:
czaks
2014-06-10 17:51:03 +02:00
parent c04b419639 2f55cd9897
commit c2cbbe7e22
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
inc/mod/pages.php
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, false, true);
setcookie('update', serialize($latest), time() + $config['check_updates_time'], $config['cookies']['jail'] ? $config['cookies']['path'] : '/', null, $_SERVER['HTTPS'], true);
}
if ($latest)