Merged in mcuiza/processmaker/HOR-1284 (pull request #4452)

HOR-1284
This commit is contained in:
Julio Cesar Laura Avendaño
2016-06-24 12:21:28 -04:00

View File

@@ -902,7 +902,7 @@ if (! defined( 'EXECUTE_BY_CRON' )) {
if (PHP_VERSION < 5.2) { if (PHP_VERSION < 5.2) {
setcookie(session_name(), session_id(), time() + $timelife, '/', '; HttpOnly'); setcookie(session_name(), session_id(), time() + $timelife, '/', '; HttpOnly');
} else { } else {
setcookie(session_name(), session_id(), time() + $timelife, '/', null, false, true); setcookie(session_name(), session_id(), time() + $timelife, '/', null, G::is_https(), true);
} }
} }
$RBAC->initRBAC(); $RBAC->initRBAC();
@@ -979,7 +979,7 @@ if (! defined( 'EXECUTE_BY_CRON' )) {
if (PHP_VERSION < 5.2) { if (PHP_VERSION < 5.2) {
setcookie(session_name(), session_id(), time() + $timelife, '/', '; HttpOnly'); setcookie(session_name(), session_id(), time() + $timelife, '/', '; HttpOnly');
} else { } else {
setcookie(session_name(), session_id(), time() + $timelife, '/', null, false, true); setcookie(session_name(), session_id(), time() + $timelife, '/', null, G::is_https(), true);
} }
} }
$RBAC->initRBAC(); $RBAC->initRBAC();