Merge remote-tracking branch 'upstream/develop' into relayed-dfrn-dspr

[friendica.git] / mod / editpost.php

diff --git a/mod/editpost.php b/mod/editpost.php
index 2bbc2f2b61ed9ce5be8f31316262944bf558f8fc..209fbcf5ab8d9327a1c3f02fe32ec71372f86d92 100644 (file)
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -1,6 +1,22 @@
 <?php
 /**
- * @file mod/editpost.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 use Friendica\App;
@@ -19,14 +35,14 @@ function editpost_content(App $a)
        $o = '';
 
        if (!local_user()) {
-               notice(DI::l10n()->t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                return;
        }
 
        $post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
        if (!$post_id) {
-               notice(DI::l10n()->t('Item not found') . EOL);
+               notice(DI::l10n()->t('Item not found'));
                return;
        }
 
@@ -36,7 +52,7 @@ function editpost_content(App $a)
        $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $post_id, 'uid' => local_user()]);
 
        if (!DBA::isResult($item)) {
-               notice(DI::l10n()->t('Item not found') . EOL);
+               notice(DI::l10n()->t('Item not found'));
                return;
        }
 
@@ -70,6 +86,7 @@ function editpost_content(App $a)
                '$return_path' => '/display/' . $item['guid'],
                '$action' => 'item',
                '$share' => DI::l10n()->t('Save'),
+               '$loading' => DI::l10n()->t('Loading...'),
                '$upload' => DI::l10n()->t('Upload photo'),
                '$shortupload' => DI::l10n()->t('upload photo'),
                '$attach' => DI::l10n()->t('Attach file'),
@@ -114,7 +131,9 @@ function editpost_content(App $a)
                //jot nav tab (used in some themes)
                '$message' => DI::l10n()->t('Message'),
                '$browser' => DI::l10n()->t('Browser'),
-               '$shortpermset' => DI::l10n()->t('permissions'),
+               '$shortpermset' => DI::l10n()->t('Permissions'),
+
+               '$compose_link_title' => DI::l10n()->t('Open Compose page'),
        ]);
 
        return $o;
@@ -126,7 +145,7 @@ function undo_post_tagging($s) {
        if ($cnt) {
                foreach ($matches as $mtch) {
                        if (in_array($mtch[1], ['!', '@'])) {
-                               $contact = Contact::getDetailsByURL($mtch[2]);
+                               $contact = Contact::getByURL($mtch[2], false, ['addr']);
                                $mtch[3] = empty($contact['addr']) ? $mtch[2] : $contact['addr'];
                        }
                        $s = str_replace($mtch[0], $mtch[1] . $mtch[3],$s);