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

Merge pull request #7846 from annando/notes-warnings

Browse source 
Fix further notes and warnings
This commit is contained in:
Hypolite Petovan 2019-11-19 07:03:34 -05:00 committed by GitHub
commit 91491dd798
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Model/GServer.php
View file

@ -1061,12 +1061,12 @@ class GServer
$attr = []; $attr = [];
if ($node->attributes->length) { if ($node->attributes->length) {
foreach ($node->attributes as $attribute) { foreach ($node->attributes as $attribute) {
$attribute->value = @trim($attribute->value); $value = trim($attribute->value);
if (empty($attribute->value)) { if (empty($value)) {
continue; continue;
} }
$attr[$attribute->name] = $attribute->value; $attr[$attribute->name] = $value;
} }
if (empty($attr['name']) || empty($attr['content'])) { if (empty($attr['name']) || empty($attr['content'])) {
@ -1117,12 +1117,12 @@ class GServer
$attr = []; $attr = [];
if ($node->attributes->length) { if ($node->attributes->length) {
foreach ($node->attributes as $attribute) { foreach ($node->attributes as $attribute) {
$attribute->value = @trim($attribute->value); $value = trim($attribute->value);
if (empty($attribute->value)) { if (empty($value)) {
continue; continue;
} }
$attr[$attribute->name] = $attribute->value; $attr[$attribute->name] = $value;
} }
if (empty($attr['property']) || empty($attr['content'])) { if (empty($attr['property']) || empty($attr['content'])) {

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

@ -653,6 +653,9 @@ class Transmitter
public static function ItemArrayFromMail($mail_id) public static function ItemArrayFromMail($mail_id)
{ {
$mail = DBA::selectFirst('mail', [], ['id' => $mail_id]); $mail = DBA::selectFirst('mail', [], ['id' => $mail_id]);
if (!DBA::isResult($mail)) {
return [];
}
$reply = DBA::selectFirst('mail', ['uri'], ['parent-uri' => $mail['parent-uri'], 'reply' => false]); $reply = DBA::selectFirst('mail', ['uri'], ['parent-uri' => $mail['parent-uri'], 'reply' => false]);
@ -1234,6 +1237,10 @@ class Transmitter
*/ */
public static function createNote($item) public static function createNote($item)
{ {
if (empty($item)) {
return [];
}
if ($item['event-type'] == 'event') { if ($item['event-type'] == 'event') {
$type = 'Event'; $type = 'Event';
} elseif (!empty($item['title'])) { } elseif (!empty($item['title'])) {