Merge pull request #10715 from MrPetovan/bug/10691-scheduled-date-picker-timezone

Simplify max_data parameter for Temporal::getDateTimeField in include/conversation
This commit is contained in:
Michael Vogel 2021-09-16 00:00:42 +02:00 committed by GitHub
commit 174a47cb71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions

View file

@ -1147,10 +1147,10 @@ function status_editor(App $a, array $x = [], $notes_cid = 0, $popup = false)
'$placeholdercategory' => Feature::isEnabled(local_user(), 'categories') ? DI::l10n()->t("Categories \x28comma-separated list\x29") : '',
'$scheduled_at' => Temporal::getDateTimeField(
new DateTime(),
DateTime::createFromFormat(DateTimeFormat::MYSQL, DateTimeFormat::local('now + 6 months')),
new DateTime('now + 6 months'),
null,
DI::l10n()->t('Scheduled at'),
'scheduled_at',
'scheduled_at'
),
'$wait' => DI::l10n()->t('Please wait'),
'$permset' => DI::l10n()->t('Permission settings'),

View file

@ -167,13 +167,12 @@ class Compose extends BaseModule
'$placeholdercategory' => (Feature::isEnabled(local_user(),'categories') ? DI::l10n()->t('Categories (comma-separated list)') : ''),
'$scheduled_at' => Temporal::getDateTimeField(
new DateTime(),
DateTime::createFromFormat(DateTimeFormat::MYSQL, DateTimeFormat::local('now + 6 months')),
new DateTime('now + 6 months'),
null,
DI::l10n()->t('Scheduled at'),
'scheduled_at',
'scheduled_at'
),
'$title' => $title,
'$category' => $category,
'$body' => $body,