Browse Source

Merge pull request #9228 from annando/warning-fatal

Fix fatal errors, warnings and notices
tags/2020.09
Tobias Diekershoff 1 month ago
committed by GitHub
parent
commit
5a0b85ca20
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions
  1. +3
    -0
      src/Protocol/ActivityPub/Transmitter.php
  2. +1
    -1
      src/Protocol/Feed.php
  3. +1
    -0
      src/Util/ExAuth.php

+ 3
- 0
src/Protocol/ActivityPub/Transmitter.php View File

@@ -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) {


+ 1
- 1
src/Protocol/Feed.php View File

@@ -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'] = '';
}



+ 1
- 0
src/Util/ExAuth.php View File

@@ -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;



Loading…
Cancel
Save