mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact

Browse source
This commit is contained in:
Michael 2021-09-18 20:27:24 +00:00
commit 3dddea96fa
30 changed files with 414 additions and 301 deletions
Download patch file Download diff file Expand all files Collapse all files

11
include/conversation.php
View file

@ -419,7 +419,14 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
$tpl = 'search_item.tpl';
$uriids = [];
foreach ($items as $item) {
if (in_array($item['uri-id'], $uriids)) {
continue;
}
$uriids[] = $item['uri-id'];
if (!visible_activity($item)) {
continue;
@ -1140,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'),