strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #9228 from annando/warning-fatal

Browse source 
Fix fatal errors, warnings and notices
This commit is contained in:
Tobias Diekershoff 2020-09-18 16:01:50 +02:00 committed by GitHub
commit 5a0b85ca20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Protocol/ActivityPub/Transmitter.php
View file

@ -855,6 +855,9 @@ class Transmitter
public static function createActivityFromMail($mail_id, $object_mode = false) public static function createActivityFromMail($mail_id, $object_mode = false)
{ {
$mail = self::ItemArrayFromMail($mail_id); $mail = self::ItemArrayFromMail($mail_id);
if (empty($mail)) {
return [];
}
$object = self::createNote($mail); $object = self::createNote($mail);
if (!$object_mode) { if (!$object_mode) {

2
src/Protocol/Feed.php
View file

@ -563,7 +563,7 @@ class Feed
$data_text = strip_tags(trim($data['text'] ?? '')); $data_text = strip_tags(trim($data['text'] ?? ''));
$item_body = strip_tags(trim($item['body'] ?? '')); $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'] = ''; $data['text'] = '';
} }

1
src/Util/ExAuth.php
View file

@ -39,6 +39,7 @@ use Friendica\App;
use Friendica\Core\Config\IConfig; use Friendica\Core\Config\IConfig;
use Friendica\Core\PConfig\IPConfig; use Friendica\Core\PConfig\IPConfig;
use Friendica\Database\Database; use Friendica\Database\Database;
use Friendica\DI;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Network\HTTPException; use Friendica\Network\HTTPException;