webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-08-09 10:22:51 +03:00
Code Activity

Includes: Added ID de-duplicating and more thorough clean-up

Browse Source
This commit is contained in:
Dan Brown
2023-11-27 20:16:27 +00:00
parent 71c93c8878
commit b569827114
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Entities/Tools/PageIncludeParser.php
View File

@@ -145,6 +145,7 @@ class PageIncludeParser
$parentText = $parent->textContent;
$tagPos = strpos($parentText, $tag->tagContent);
$before = $tagPos < (strlen($parentText) / 2);
$this->toCleanup[] = $tag->domNode->parentNode;
if ($before) {
$parent->parentNode->insertBefore($tag->domNode, $parent);
@@ -206,8 +207,10 @@ class PageIncludeParser
{
foreach ($this->toCleanup as $element) {
$element->normalize();
if ($element->parentNode && !$element->hasChildNodes()) {
$element->parentNode->removeChild($element);
while ($element->parentNode && !$element->hasChildNodes()) {
$parent = $element->parentNode;
$parent->removeChild($element);
$element = $parent;
}
}
}