diff options
| author | Andrew Dolgov <fox@fakecake.org> | 2024-06-14 13:47:14 +0300 |
|---|---|---|
| committer | Andrew Dolgov <fox@fakecake.org> | 2024-06-14 13:47:14 +0300 |
| commit | cc51487f080166b2a21eb529f1d4fc29994d9ff1 (patch) | |
| tree | e87e5ce6c96a233b9f50c8fb456b02834a585ec1 /classes/TimeHelper.php | |
| parent | 66db7dc0ac996f528f6ff9d71f3cc7ec30d65278 (diff) | |
| parent | 9e6684e9277dace834ef10dab21c5b585f291675 (diff) | |
Merge branch 'master' into weblate-integration
Diffstat (limited to 'classes/TimeHelper.php')
| -rw-r--r-- | classes/TimeHelper.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/TimeHelper.php b/classes/TimeHelper.php index 453ee0cee..f1c437831 100644 --- a/classes/TimeHelper.php +++ b/classes/TimeHelper.php @@ -1,7 +1,7 @@ <?php class TimeHelper { - static function smart_date_time(int $timestamp, int $tz_offset = 0, int $owner_uid = null, bool $eta_min = false): string { + static function smart_date_time(int $timestamp, int $tz_offset = 0, ?int $owner_uid = null, bool $eta_min = false): string { if (!$owner_uid) $owner_uid = $_SESSION['uid']; if ($eta_min && time() + $tz_offset - $timestamp < 3600) { @@ -21,7 +21,7 @@ class TimeHelper { } } - static function make_local_datetime(?string $timestamp, bool $long, int $owner_uid = null, + static function make_local_datetime(?string $timestamp, bool $long, ?int $owner_uid = null, bool $no_smart_dt = false, bool $eta_min = false): string { if (!$owner_uid) $owner_uid = $_SESSION['uid']; |