Merge pull request #273 from zzottel/master

prevent reload loop if JS is active, but no cookies accepted
This commit is contained in:
friendica 2014-01-16 13:06:49 -08:00
commit be6a16139c

View file

@ -245,7 +245,11 @@ if(! x($a->page,'content'))
/* set JS cookie */
if($_COOKIE['jsAvailable'] != 1) {
$a->page['content'] .= '<script>document.cookie="jsAvailable=1; path=/"; location.reload();</script>';
$a->page['content'] .= '<script>document.cookie="jsAvailable=1; path=/"; var jsMatch = /\&JS=1/; if (!jsMatch.exec(location.href)) { location.href = location.href + "&JS=1"; }</script>';
/* emulate JS cookie if cookies are not accepted */
if ($_GET['JS'] == 1) {
$_COOKIE['jsAvailable'] = 1;
}
}