Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 6 additions & 0 deletions src/Fieldtypes/Time.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace Statamic\Fieldtypes;

use Statamic\Fields\Fieldtype;
use Statamic\Fieldtypes\Time\StringableTime;
use Statamic\Rules\TimeFieldtype as ValidationRule;

class Time extends Fieldtype
Expand Down Expand Up @@ -36,6 +37,11 @@ protected function configFieldItems(): array
];
}

public function augment($value)
{
return new StringableTime($value);
}

public function rules(): array
{
return [new ValidationRule($this)];
Expand Down
10 changes: 10 additions & 0 deletions src/Fieldtypes/Time/StringableTime.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php

namespace Statamic\Fieldtypes\Time;

use Statamic\Fields\ArrayableString;

class StringableTime extends ArrayableString
{
//
}
5 changes: 4 additions & 1 deletion src/Modifiers/CoreModifiers.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
use Statamic\Fieldtypes\Bard;
use Statamic\Fieldtypes\Bard\Augmentor;
use Statamic\Fieldtypes\Link\ArrayableLink;
use Statamic\Fieldtypes\Time\StringableTime;
use Statamic\Statamic;
use Statamic\Support\Arr;
use Statamic\Support\Dumper;
Expand Down Expand Up @@ -3328,11 +3329,13 @@ private function carbon($value)
return optional();
}

$shouldLocalizeDate = config('statamic.system.localize_dates_in_modifiers') && ! $value instanceof StringableTime;

if (! $value instanceof Carbon) {
$value = (is_numeric($value)) ? Date::createFromTimestamp($value, config('app.timezone')) : Date::parse($value);
}

if (config('statamic.system.localize_dates_in_modifiers')) {
if ($shouldLocalizeDate) {
$value->setTimezone(Statamic::displayTimezone());
}

Expand Down
Loading