Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[5.1] DateTime: Don't convert when there is no user #43521

Merged
merged 1 commit into from
May 26, 2024
Merged

[5.1] DateTime: Don't convert when there is no user #43521

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions libraries/src/HTML/HTMLHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,8 +884,10 @@ public static function date($input = 'now', $format = null, $tz = true, $gregori
// Get a date object based on UTC.
$date = Factory::getDate($input, 'UTC');

// Set the correct time zone based on the user configuration.
$date->setTimezone($app->getIdentity()->getTimezone());
// Set the correct time zone based on the user configuration. CLI doesn't have a user
if ($app->getIdentity()) {
$date->setTimezone($app->getIdentity()->getTimezone());
}
} elseif ($tz === false) {
// UTC date converted to server time zone.
// Get a date object based on UTC.
Expand Down