From 27a924f286534cfb167317c64d6f4d5f374593dd Mon Sep 17 00:00:00 2001 From: Domovoy Date: Fri, 27 Jul 2012 10:08:30 +0200 Subject: [PATCH 1/2] return 0 from get_body_length before loading the body to DomDocument if body is empty --- showmore/showmore.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/showmore/showmore.php b/showmore/showmore.php index 096fd3f70..de8c2f074 100755 --- a/showmore/showmore.php +++ b/showmore/showmore.php @@ -69,10 +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) // Get rid of the warning. It would be better to have some valid html as input - $dom = @DomDocument::loadHTML($body); + $dom = DomDocument::loadHTML($body); $xpath = new DOMXPath($dom); /* From 7639f9117936fda9fb886c4e6934be315a30b72e Mon Sep 17 00:00:00 2001 From: Domovoy Date: Fri, 27 Jul 2012 10:12:12 +0200 Subject: [PATCH 2/2] Oooops, put back the warnings ignore for DomDocument --- showmore/showmore.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/showmore/showmore.php b/showmore/showmore.php index de8c2f074..1f40b027b 100755 --- a/showmore/showmore.php +++ b/showmore/showmore.php @@ -77,7 +77,7 @@ function get_body_length($body) { // 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 - $dom = DomDocument::loadHTML($body); + $dom = @DomDocument::loadHTML($body); $xpath = new DOMXPath($dom); /*