Merge remote-tracking branch 'upstream/master'

[friendica-addons.git] / showmore / showmore.php

diff --git a/showmore/showmore.php b/showmore/showmore.php
index 5b0f14a0c38fe39c7ecf954bde8a03bcad34acd1..1f40b027be3b7da947e3905e8a9a817ffd176c7a 100755 (executable)
--- a/showmore/showmore.php
+++ b/showmore/showmore.php
@@ -69,8 +69,15 @@ function showmore_addon_settings_post(&$a,&$b) {
 function get_body_length($body) {
        $string = trim($body);
 
+       // DomDocument doesn't like empty strings
+       if(! strlen($string)) {
+               return 0;
+       }
+
        // We need to get rid of hidden tags (display: none)
-       $dom = DomDocument::loadHTML($body);
+
+       // Get rid of the warning. It would be better to have some valid html as input
+       $dom = @DomDocument::loadHTML($body);
        $xpath = new DOMXPath($dom);
 
        /*