Merge pull request #10479 from MrPetovan/task/9378-merge-share-template

[friendica.git] / mod / editpost.php

diff --git a/mod/editpost.php b/mod/editpost.php
index 209fbcf5ab8d9327a1c3f02fe32ec71372f86d92..6f80bac0c1ad21b148b5d6bc0b7d351bf3e46e82 100644 (file)
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -26,8 +26,7 @@ use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
-use Friendica\Model\FileTag;
-use Friendica\Model\Item;
+use Friendica\Model\Post;
 use Friendica\Util\Crypto;
 
 function editpost_content(App $a)
@@ -47,9 +46,9 @@ function editpost_content(App $a)
        }
 
        $fields = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
-               'type', 'body', 'title', 'file', 'wall', 'post-type', 'guid'];
+               'body', 'title', 'uri-id', 'wall', 'post-type', 'guid'];
 
-       $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $post_id, 'uid' => local_user()]);
+       $item = Post::selectFirstForUser(local_user(), $fields, ['id' => $post_id, 'uid' => local_user()]);
 
        if (!DBA::isResult($item)) {
                notice(DI::l10n()->t('Item not found'));
@@ -66,7 +65,8 @@ function editpost_content(App $a)
        DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
                '$ispublic' => '&nbsp;', // DI::l10n()->t('Visible to <strong>everybody</strong>'),
                '$geotag' => $geotag,
-               '$nickname' => $a->user['nickname']
+               '$nickname' => $a->user['nickname'],
+               '$is_mobile' => DI::mode()->isMobile(),
        ]);
 
        if (strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) {
@@ -115,7 +115,7 @@ function editpost_content(App $a)
                '$jotnets' => $jotnets,
                '$title' => $item['title'],
                '$placeholdertitle' => DI::l10n()->t('Set title'),
-               '$category' => FileTag::fileToList($item['file'], 'category'),
+               '$category' => Post\Category::getCSVByURIId($item['uri-id'], local_user(), Post\Category::CATEGORY),
                '$placeholdercategory' => (Feature::isEnabled(local_user(),'categories') ? DI::l10n()->t("Categories \x28comma-separated list\x29") : ''),
                '$emtitle' => DI::l10n()->t('Example: bob@example.com, mary@example.com'),
                '$lockstate' => $lockstate,