From 9a0c3cc834aa01cc76fdf60d30bf69824abe602c Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 14 Sep 2021 17:59:05 -0400 Subject: [PATCH] Simplify max_data parameter for Temporal::getDateTimeField --- include/conversation.php | 4 ++-- src/Module/Item/Compose.php | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index c49aacb177..1cb2c745cc 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -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'), diff --git a/src/Module/Item/Compose.php b/src/Module/Item/Compose.php index 29fdbea746..f81b0c8969 100644 --- a/src/Module/Item/Compose.php +++ b/src/Module/Item/Compose.php @@ -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,