Simplify max_data parameter for Temporal::getDateTimeField

diff --git a/include/conversation.php b/include/conversation.php
index c49aacb17780cd3ed6a2c2713110b6adad8dbe14..1cb2c745cc50a058a45d5382eb2a3d3cb1e2e543 100644 (file)
--- 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 29fdbea746c88b1a78ed8ca47165082bfb5de421..f81b0c89692588cf754daf1d7baa314d217213f4 100644 (file)
--- 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,