Merged in victorsl/processmaker/PM-4280-3017 (pull request #3339)
PM-4280
This commit is contained in:
@@ -206,14 +206,14 @@ if ($timeZoneFailed) {
|
||||
$arrayTimeZoneId = $dateTime->getTimeZoneIdByTimeZoneOffset($browserTimeZoneOffset);
|
||||
|
||||
array_unshift($arrayTimeZoneId, 'false');
|
||||
array_walk($arrayTimeZoneId, function (&$value, $key, $parameter) { $value = ['TZ_UID' => $value, 'TZ_NAME' => '(UTC' . $parameter . ') ' . $value]; }, $browserUtcOffset);
|
||||
array_walk($arrayTimeZoneId, function (&$value, $key, $parameter) { $value = ['TZ_UID' => $value, 'TZ_NAME' => '(UTC ' . $parameter . ') ' . $value]; }, $browserUtcOffset);
|
||||
|
||||
$_SESSION['_DBArray'] = ['TIME_ZONE' => $arrayTimeZoneId];
|
||||
|
||||
$arrayData = [
|
||||
'USR_USERNAME' => $userUsername,
|
||||
'USR_PASSWORD' => $userPassword,
|
||||
'USR_TIME_ZONE' => '(UTC' . $userUtcOffset . ') ' . $userTimeZone,
|
||||
'USR_TIME_ZONE' => '(UTC ' . $userUtcOffset . ') ' . $userTimeZone,
|
||||
'BROWSER_TIME_ZONE' => $browserTimeZone
|
||||
];
|
||||
|
||||
|
||||
@@ -26,10 +26,7 @@
|
||||
<script type="text/javascript">
|
||||
function getBrowserTimeZoneOffset()
|
||||
{
|
||||
var d = new Date();
|
||||
var tzOffset = d.getTimezoneOffset();
|
||||
|
||||
return ((tzOffset > 0)? "-" : "") + (tzOffset * 60);
|
||||
return -1 * ((new Date()).getTimezoneOffset() * 60);
|
||||
}
|
||||
|
||||
function stringReplace(strSearch, strReplace, str)
|
||||
|
||||
@@ -57,10 +57,7 @@
|
||||
|
||||
function getBrowserTimeZoneOffset()
|
||||
{
|
||||
var d = new Date();
|
||||
var tzOffset = d.getTimezoneOffset();
|
||||
|
||||
return ((tzOffset > 0)? "-" : "") + (tzOffset * 60);
|
||||
return -1 * ((new Date()).getTimezoneOffset() * 60);
|
||||
}
|
||||
|
||||
function stringReplace(strSearch, strReplace, str)
|
||||
|
||||
Reference in New Issue
Block a user