Added "blocked" fields

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index 837c6a047cfef3fd0e2ac7dbe00dbf3296c2fa20..f681155a4eb394f14401fcf1eea4fa2cdc63cd6e 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -324,8 +324,7 @@ function conv_get_blocklist()
        $blocklist = [];
 
        foreach (explode(',', $str_blocked) as $entry) {
-               // The 4th parameter guarantees that there always will be a public contact entry
-               $cid = Contact::getIdForURL(trim($entry), 0, false, ['url' => trim($entry)]);
+               $cid = Contact::getIdForURL(trim($entry), 0, false);
                if (!empty($cid)) {
                        $blocklist[] = $cid;
                }
@@ -763,7 +762,7 @@ function conversation_fetch_comments($thread_items, bool $pinned, array $activit
                                }
 
                                if (($row['gravity'] == GRAVITY_PARENT) && !empty($row['causer-id'])) {
-                                       $row['reshared'] = DI::l10n()->t('%s reshared this.', '<a href="'. htmlentities(Contact::magicLinkbyId($row['causer-id'])) .'">' . htmlentities($name) . '</a>');
+                                       $row['reshared'] = DI::l10n()->t('%s reshared this.', '<a href="'. htmlentities(Contact::magicLinkById($row['causer-id'])) .'">' . htmlentities($name) . '</a>');
                                }
                                $row['direction'] = ['direction' => 3, 'title' => (empty($row['causer-id']) ? DI::l10n()->t('Reshared') : DI::l10n()->t('Reshared by %s', $name))];
                                break;
@@ -1178,7 +1177,8 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
                '$term'      => DI::l10n()->t('Tag term:'),
                '$fileas'    => DI::l10n()->t('Save to Folder:'),
                '$whereareu' => DI::l10n()->t('Where are you right now?'),
-               '$delitems'  => DI::l10n()->t("Delete item\x28s\x29?")
+               '$delitems'  => DI::l10n()->t("Delete item\x28s\x29?"),
+               '$is_mobile' => DI::mode()->isMobile(),
        ]);
 
        $jotplugins = '';