toddy/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Pull requests Activity

Merge pull request #1062 from MrPetovan/bug/fatal-errors

Browse source 
[showmore] Use DOMDocument object instead of static call to loadHTML()
This commit is contained in:
Michael Vogel 2020-12-27 06:58:43 +01:00 committed by GitHub
parent 7ce00592a2 368a0d3f6c
commit 6439a51a19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
showmore/showmore.php
View file

@ -81,8 +81,9 @@ function get_body_length($body)
// We need to get rid of hidden tags (display: none) // We need to get rid of hidden tags (display: none)
// Get rid of the warning. It would be better to have some valid html as input // Get rid of the warning. It would be better to have some valid html as input
$dom = @DomDocument::loadHTML($body); $doc = new DOMDocument();
$xpath = new DOMXPath($dom); @$doc->loadHTML($body);
$xpath = new DOMXPath($doc);
/* /*
* Checking any possible syntax of the style attribute with xpath is impossible * Checking any possible syntax of the style attribute with xpath is impossible
@ -96,7 +97,7 @@ function get_body_length($body)
} }
} }
// Now we can get the body of our HTML DomDocument, it contains only what is visible // Now we can get the body of our HTML DomDocument, it contains only what is visible
$string = $dom->saveHTML(); $string = $doc->saveHTML();
$string = strip_tags($string); $string = strip_tags($string);
return strlen($string); return strlen($string);