Fix fatal errors and notices

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index dae783bd74d4edb5ac70de55ab89c4eef6c64923..6dd918c4c60aa3f4cecd3a8ae5eaccc2b675247b 100644 (file)
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -855,6 +855,9 @@ class Transmitter
        public static function createActivityFromMail($mail_id, $object_mode = false)
        {
                $mail = self::ItemArrayFromMail($mail_id);
+               if (empty($mail)) {
+                       return [];
+               }
                $object = self::createNote($mail);
 
                if (!$object_mode) {

diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index 90bb2455b58c3ef5f39413baf80cf0187429e8f2..e73ded025697abfbc12285b97f062e162ed34621 100644 (file)
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -563,7 +563,7 @@ class Feed
                                $data_text = strip_tags(trim($data['text'] ?? ''));
                                $item_body = strip_tags(trim($item['body'] ?? ''));
 
-                               if (($data_text == $item_body) || strstr($item_body, $data_text)) {
+                               if (!empty($data_text) && (($data_text == $item_body) || strstr($item_body, $data_text))) {
                                        $data['text'] = '';
                                }
 

diff --git a/src/Util/ExAuth.php b/src/Util/ExAuth.php
index a896440a97c205a61d7cf2861ab919177adc80ee..7771712f31ff73a16f2ad138c1276d214752bef8 100644 (file)
--- a/src/Util/ExAuth.php
+++ b/src/Util/ExAuth.php
@@ -39,6 +39,7 @@ use Friendica\App;
 use Friendica\Core\Config\IConfig;
 use Friendica\Core\PConfig\IPConfig;
 use Friendica\Database\Database;
+use Friendica\DI;
 use Friendica\Model\User;
 use Friendica\Network\HTTPException;