Fixed issue with aditional body tags and DOMDocument Warning

Author: ihorvansach

Block/Post/AbstractPost.php

@@ -103,12 +103,22 @@ public function getShorContent()
 
         if ($p = mb_strpos($content, $pageBraker)) {
             $content = mb_substr($content, 0, $p);
+            try {
+                libxml_use_internal_errors(true);
+                $dom = new \DOMDocument();
+                $dom->loadHTML('<?xml encoding="UTF-8">' . $content);
+                $body = $dom->getElementsByTagName('body');
+                if ( $body && $body->length > 0 ) {
+                    $body = $body->item(0);
+                    $_content = new \DOMDocument;
+                    foreach ($body->childNodes as $child){
+                        $_content->appendChild($_content->importNode($child, true));
+                    }
+                    $content = $_content->saveHTML();
+                }
+            } catch (\Exception $e) {}
         }
 
-        $dom = new \DOMDocument();
-        $dom->loadHTML('<?xml encoding="UTF-8">' . $content);
-        $content = $dom->saveHTML();
-
         return $content;
     }
 

Block/Widget/Recent.php

@@ -131,19 +131,29 @@ public function getCategory()
      */
     public function getShorContent($post)
     {
-        $content = $post->getContent();
+        $content = $this->_filterProvider->getPageFilter()->filter(
+            $post->getContent()
+        );
         $pageBraker = '<!-- pagebreak -->';
 
         if ($p = mb_strpos($content, $pageBraker)) {
             $content = mb_substr($content, 0, $p);
+            try {
+                libxml_use_internal_errors(true);
+                $dom = new \DOMDocument();
+                $dom->loadHTML('<?xml encoding="UTF-8">' . $content);
+                $body = $dom->getElementsByTagName('body');
+                if ( $body && $body->length > 0 ) {
+                    $body = $body->item(0);
+                    $_content = new \DOMDocument;
+                    foreach ($body->childNodes as $child){
+                        $_content->appendChild($_content->importNode($child, true));
+                    }
+                    $content = $_content->saveHTML();
+                }
+            } catch (\Exception $e) {}
         }
 
-        $content = $this->_filterProvider->getPageFilter()->filter($content);
-
-        $dom = new \DOMDocument();
-        $dom->loadHTML('<?xml encoding="UTF-8">' . $content);
-        $content = $dom->saveHTML();
-
         return $content;
     }
 }