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

Merge pull request #7844 from annando/warnings

Browse source 
Fix warnings
This commit is contained in:
Hypolite Petovan 2019-11-18 13:47:52 -05:00 committed by GitHub
commit 1964ca6a4a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Model/GServer.php
View file

@ -1061,7 +1061,7 @@ 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); $attribute->value = @trim($attribute->value);
if (empty($attribute->value)) { if (empty($attribute->value)) {
continue; continue;
} }
@ -1117,7 +1117,7 @@ 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); $attribute->value = @trim($attribute->value);
if (empty($attribute->value)) { if (empty($attribute->value)) {
continue; continue;
} }

2
src/Protocol/Feed.php
View file

@ -422,7 +422,7 @@ class Feed {
$data = ParseUrl::getSiteinfoCached($item['plink'], true); $data = ParseUrl::getSiteinfoCached($item['plink'], true);
if (!empty($data['text']) && !empty($data['title']) && (mb_strlen($item['body']) < mb_strlen($data['text']))) { if (!empty($data['text']) && !empty($data['title']) && (mb_strlen($item['body']) < mb_strlen($data['text']))) {
// When the fetched page info text is longer than the body, we do try to enhance the body // When the fetched page info text is longer than the body, we do try to enhance the body
if ((strpos($data['title'], $item['body']) === false) && (strpos($data['text'], $item['body']) === false)) { if (!empty($item['body']) && (strpos($data['title'], $item['body']) === false) && (strpos($data['text'], $item['body']) === false)) {
// The body is not part of the fetched page info title or page info text. So we add the text to the body // The body is not part of the fetched page info title or page info text. So we add the text to the body
$item['body'] .= "\n\n" . $data['text']; $item['body'] .= "\n\n" . $data['text'];
} else { } else {