Merge remote-tracking branch 'upstream/develop' into user-contact

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index c49aacb17780cd3ed6a2c2713110b6adad8dbe14..507add97d61ef5f79a9c8db6bc0c21431dea1616 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -312,7 +312,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                                . "'; </script>\r\n";
                }
        } elseif ($mode === 'profile') {
-               $items = conversation_add_children($items, false, $order, $uid);
+               $items = conversation_add_children($items, false, $order, local_user());
 
                if (!$update) {
                        $tab = 'posts';
@@ -400,7 +400,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
        $formSecurityToken = BaseModule::getFormSecurityToken('contact_action');
 
        if (!empty($items)) {
-               if (in_array($mode, ['community', 'contacts'])) {
+               if (in_array($mode, ['community', 'contacts', 'profile'])) {
                        $writable = true;
                } else {
                        $writable = ($items[0]['uid'] == 0) && in_array($items[0]['network'], Protocol::FEDERATED);
@@ -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'),