X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Feditpost.php;h=cc72dbd3c2eddbd864b28250254b6467d96ce32d;hb=fca93793480839660870e899bea88f3637859fff;hp=4bfb63ada5de6cdd14a5ec1edac3f6922a0cc1fc;hpb=dc842f4f37a5ff9cb787cac23272c38faf2ff892;p=friendica.git

diff --git a/mod/editpost.php b/mod/editpost.php
index 4bfb63ada5..cc72dbd3c2 100644
--- 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,9 +26,8 @@ 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\Model\User;
 use Friendica\Util\Crypto;
 
 function editpost_content(App $a)
@@ -40,7 +39,7 @@ function editpost_content(App $a)
 		return;
 	}
 
-	$post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
+	$post_id = ((DI::args()->getArgc() > 1) ? intval(DI::args()->getArgv()[1]) : 0);
 
 	if (!$post_id) {
 		notice(DI::l10n()->t('Item not found'));
@@ -48,7 +47,7 @@ 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 = Post::selectFirstForUser(local_user(), $fields, ['id' => $post_id, 'uid' => local_user()]);
 
@@ -57,6 +56,8 @@ function editpost_content(App $a)
 		return;
 	}
 
+	$user = User::getById(local_user());
+
 	$geotag = '';
 
 	$o .= Renderer::replaceMacros(Renderer::getMarkupTemplate("section_title.tpl"), [
@@ -67,7 +68,7 @@ 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->getLoggedInUserNickname(),
 		'$is_mobile' => DI::mode()->isMobile(),
 	]);
 
@@ -109,7 +110,7 @@ function editpost_content(App $a)
 		'$posttype' => $item['post-type'],
 		'$content' => undo_post_tagging($item['body']),
 		'$post_id' => $post_id,
-		'$defloc' => $a->user['default-location'],
+		'$defloc' => $user['default-location'],
 		'$visitor' => 'none',
 		'$pvisit' => 'none',
 		'$emailcc' => DI::l10n()->t('CC: email addresses'),
@@ -117,7 +118,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,
@@ -126,7 +127,6 @@ function editpost_content(App $a)
 		'$profile_uid' => $_SESSION['uid'],
 		'$preview' => DI::l10n()->t('Preview'),
 		'$jotplugins' => $jotplugins,
-		'$sourceapp' => DI::l10n()->t($a->sourcename),
 		'$cancel' => DI::l10n()->t('Cancel'),
 		'$rand_num' => Crypto::randomDigits(12),