Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 02:30:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Avoid HTML parsing of an empty body

Browse source
This commit is contained in:
Michael 2021-04-10 05:46:19 +00:00
parent 3e2fa7867c
commit 5a00902e11
7 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Content/Text/BBCode.php
View file

@ -1178,7 +1178,11 @@ class BBCode
// if its not a picture then look if its a page that contains a picture link
$body = DI::httpRequest()->fetch($match[1]);
if (empty($body)) {
DI::cache()->set($cache_key, $text);
return $text;
}
$doc = new DOMDocument();
@$doc->loadHTML($body);
$xpath = new DOMXPath($doc);
@ -1214,8 +1218,6 @@ class BBCode
private static function cleanPictureLinksCallback($match)
{
$a = DI::app();
// When the picture link is the own photo path then we can avoid fetching the link
$own_photo_url = preg_quote(Strings::normaliseLink(DI::baseUrl()->get()) . '/photos/');
if (preg_match('|' . $own_photo_url . '.*?/image/|', Strings::normaliseLink($match[1]))) {
@ -1257,6 +1259,10 @@ class BBCode
// if its not a picture then look if its a page that contains a picture link
$body = DI::httpRequest()->fetch($match[1]);
if (empty($body)) {
DI::cache()->set($cache_key, $text);
return $text;
}
$doc = new DOMDocument();
@$doc->loadHTML($body);

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

@ -605,6 +605,10 @@ class HTML
// Collecting all links
$urls = self::collectURLs($message);
if (empty($message)) {
return '';
}
@$doc->loadHTML($message, LIBXML_HTML_NODEFDTD);
self::tagToBBCode($doc, 'html', [], '', '');