From c81b63b56f080e8e7af3db1b396789ac107ebfdd Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sat, 2 Sep 2017 16:06:03 +0100 Subject: [PATCH] Fixed broken page content includes --- app/Repos/EntityRepo.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Repos/EntityRepo.php b/app/Repos/EntityRepo.php index a682e696b..9a6db3fc3 100644 --- a/app/Repos/EntityRepo.php +++ b/app/Repos/EntityRepo.php @@ -691,19 +691,19 @@ class EntityRepo $pageId = intval($splitInclude[0]); if (is_nan($pageId)) continue; - $page = $this->getById('page', $pageId, false, $ignorePermissions); - if ($page === null) { + $matchedPage = $this->getById('page', $pageId, false, $ignorePermissions); + if ($matchedPage === null) { $content = str_replace($matches[0][$index], '', $content); continue; } if (count($splitInclude) === 1) { - $content = str_replace($matches[0][$index], $page->html, $content); + $content = str_replace($matches[0][$index], $matchedPage->html, $content); continue; } $doc = new DOMDocument(); - $doc->loadHTML(mb_convert_encoding(''.$page->html.'', 'HTML-ENTITIES', 'UTF-8')); + $doc->loadHTML(mb_convert_encoding(''.$matchedPage->html.'', 'HTML-ENTITIES', 'UTF-8')); $matchingElem = $doc->getElementById($splitInclude[1]); if ($matchingElem === null) { $content = str_replace($matches[0][$index], '', $content); @@ -716,7 +716,7 @@ class EntityRepo $content = str_replace($matches[0][$index], trim($innerContent), $content); } - $page->renderedHTML = $content; + $page->setAttribute('renderedHTML', $content); return $content; }