Merge pull request #10715 from MrPetovan/bug/10691-scheduled-date-pic…

…ker-timezone Simplify max_data parameter for Temporal::getDateTimeField in include/conversation
friendica · Sep 15, 2021 · 174a47c · 174a47c
2 parents 6964213 + 9a0c3cc
commit 174a47c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -167,13 +167,12 @@ public static function content(array $parameters = [])
 			'$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,