keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #6342 from annando/notices

Browse source 
Warning and notice fixed
This commit is contained in:
Hypolite Petovan 2018-12-29 12:16:37 -05:00 committed by GitHub
commit 166b8ad440
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Content/Text/HTML.php
View file

@ -180,7 +180,9 @@ class HTML
$xpath = new DomXPath($doc); $xpath = new DomXPath($doc);
$list = $xpath->query("//pre"); $list = $xpath->query("//pre");
foreach ($list as $node) { foreach ($list as $node) {
$node->nodeValue = str_replace("\n", "\r", $node->nodeValue); // Ensure to escape unescaped & - they will otherwise raise a warning
$safe_value = preg_replace('/&(?!\w+;)/', '&', $node->nodeValue);
$node->nodeValue = str_replace("\n", "\r", $safe_value);
} }
$message = $doc->saveHTML(); $message = $doc->saveHTML();

5
src/Protocol/ActivityPub/Processor.php
View file

@ -329,6 +329,11 @@ class Processor
return; return;
} }
if (empty($object['id'])) {
Logger::log('Activity ' . $url . ' has got not id, aborting. ' . json_encode($object));
return;
}
$activity = []; $activity = [];
$activity['@context'] = $object['@context']; $activity['@context'] = $object['@context'];
unset($object['@context']); unset($object['@context']);