Fixes the error that the order of links and text was swapped in unfurl

diff --git a/wcfsetup/install/files/lib/system/html/node/HtmlNodePlainLink.class.php b/wcfsetup/install/files/lib/system/html/node/HtmlNodePlainLink.class.php
index 33083765d4b3f0ce97b0e695d10d54e77858cdb9..134432303bedd3d3a3fe0f4c96ac4ff3f2e69e25 100644 (file)
--- a/wcfsetup/install/files/lib/system/html/node/HtmlNodePlainLink.class.php
+++ b/wcfsetup/install/files/lib/system/html/node/HtmlNodePlainLink.class.php
@@ -181,64 +181,11 @@ class HtmlNodePlainLink
                 $this->topLevelParent->parentNode->insertBefore($this->link, $this->topLevelParent);
                 DOMUtil::removeNode($this->topLevelParent);
             } else {
-                $replaceNode = null;
-                $parent = $this->link;
-                $next = $this->findBr($this->link, 'nextSibling');
-                $previous = $this->findBr($this->link, 'previousSibling');
-
-                // When multiple links are in the same paragraph, `topLevelParent`
-                // may no longer be a valid reference.
-                if ($this->topLevelParent->parentNode === null) {
-                    $this->topLevelParent = $this->link;
-                    while ($this->topLevelParent->parentNode->nodeName !== 'body') {
-                        $this->topLevelParent = $this->topLevelParent->parentNode;
-                    }
-                }
-
-                // Link inside other elements(u, i, b, …)
-                while ($next === null && $previous === null && $parent !== $this->topLevelParent) {
-                    $parent = $parent->parentNode;
-                    $next = $this->findBr($parent, 'nextSibling');
-                    $previous = $this->findBr($parent, 'previousSibling');
-                }
-
-                // The link is the only content in the top level parent. This
-                // can happen when there are multiple links within one paragraph.
-                if ($next === null && $previous === null) {
-                    $this->topLevelParent->parentNode->insertBefore($this->link, $this->topLevelParent);
-                    DOMUtil::removeNode($this->topLevelParent);
-                    DOMUtil::replaceElement($this->link, $metacodeElement, false);
-                    return;
-                }
-
-                if ($next !== null) {
-                    $ancestor = $this->topLevelParent->parentNode;
-                    \assert($ancestor instanceof \DOMElement);
-                    $replaceNode = DOMUtil::splitParentsUntil(
-                        $parent,
-                        $ancestor,
-                        false
-                    );
-                }
-                if ($previous !== null) {
-                    $ancestor = $this->topLevelParent->parentNode;
-                    \assert($ancestor instanceof \DOMElement);
-                    $replaceNode = DOMUtil::splitParentsUntil(
-                        $parent,
-                        $ancestor
-                    );
-                }
-                \assert($replaceNode instanceof \DOMElement);
-
-                // Remove <br> from start and end of the new block elements
-                if ($next !== null) {
-                    DOMUtil::removeNode($next);
-                }
-                if ($previous !== null) {
-                    DOMUtil::removeNode($previous);
-                }
-                DOMUtil::replaceElement($replaceNode, $metacodeElement, false);
-
+                DOMUtil::replaceElement(
+                    HtmlNodePlainLink::splitAtLink($this->link, $this->topLevelParent),
+                    $metacodeElement,
+                    false
+                );
                 return;
             }
         }
@@ -255,7 +202,74 @@ class HtmlNodePlainLink
         $this->pristine = false;
     }
 
-    private function findBr(?\DOMNode $node, string $property): ?\DOMNode
+    /**
+     * Split a link within a block element into its own block element.
+     *
+     * @param \DOMElement $link
+     * @param \DOMElement|null $topLevelParent
+     * @return \DOMElement
+     */
+    public static function splitAtLink(\DOMElement $link, ?\DOMElement $topLevelParent = null): \DOMElement
+    {
+        $replaceNode = null;
+        $parent = $link;
+        $next = HtmlNodePlainLink::findBr($link, 'nextSibling');
+        $previous = HtmlNodePlainLink::findBr($link, 'previousSibling');
+
+        // When multiple links are in the same paragraph, `topLevelParent`
+        // may no longer be a valid reference.
+        if ($topLevelParent === null || $topLevelParent->parentNode === null) {
+            $topLevelParent = $link;
+            while ($topLevelParent->parentNode->nodeName !== 'body') {
+                $topLevelParent = $topLevelParent->parentNode;
+            }
+        }
+
+        // Link inside other elements(u, i, b, …)
+        while ($next === null && $previous === null && $parent !== $topLevelParent) {
+            $parent = $parent->parentNode;
+            $next = HtmlNodePlainLink::findBr($parent, 'nextSibling');
+            $previous = HtmlNodePlainLink::findBr($parent, 'previousSibling');
+        }
+
+        // The link is the only content in the top level parent. This
+        // can happen when there are multiple links within one paragraph.
+        if ($next === null && $previous === null) {
+            $topLevelParent->parentNode->insertBefore($link, $topLevelParent);
+            DOMUtil::removeNode($topLevelParent);
+            return $link;
+        }
+
+        if ($next !== null) {
+            $ancestor = $topLevelParent->parentNode;
+            \assert($ancestor instanceof \DOMElement);
+            $replaceNode = DOMUtil::splitParentsUntil(
+                $parent,
+                $ancestor,
+                false
+            );
+        }
+        if ($previous !== null) {
+            $ancestor = $topLevelParent->parentNode;
+            \assert($ancestor instanceof \DOMElement);
+            $replaceNode = DOMUtil::splitParentsUntil(
+                $parent,
+                $ancestor
+            );
+        }
+        \assert($replaceNode instanceof \DOMElement);
+
+        // Remove <br> from start and end of the new block elements
+        if ($next !== null) {
+            DOMUtil::removeNode($next);
+        }
+        if ($previous !== null) {
+            DOMUtil::removeNode($previous);
+        }
+        return $replaceNode;
+    }
+
+    private static function findBr(?\DOMNode $node, string $property): ?\DOMNode
     {
         if ($node === null) {
             return null;
@@ -265,6 +279,6 @@ class HtmlNodePlainLink
             return $node;
         }
 
-        return $this->findBr($node->{$property}, $property);
+        return HtmlNodePlainLink::findBr($node->{$property}, $property);
     }
 }

diff --git a/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputUnfurlUrlNode.class.php b/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputUnfurlUrlNode.class.php
index b93eee4628d6422311f114eff61f8f1117aaac97..4fbf09ad25674f63fb5af6724005981997082678 100644 (file)
--- a/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputUnfurlUrlNode.class.php
+++ b/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputUnfurlUrlNode.class.php
@@ -5,6 +5,7 @@ namespace wcf\system\html\output\node;
 use wcf\data\unfurl\url\UnfurlUrl;
 use wcf\system\html\AbstractHtmlProcessor;
 use wcf\system\html\node\AbstractHtmlNodeProcessor;
+use wcf\system\html\node\HtmlNodePlainLink;
 use wcf\system\html\node\HtmlNodeUnfurlLink;
 use wcf\system\html\output\HtmlOutputProcessor;
 use wcf\system\message\embedded\object\MessageEmbeddedObjectManager;
@@ -63,17 +64,10 @@ class HtmlOutputUnfurlUrlNode extends AbstractHtmlOutputNode
                     'enableUgc' => $enableUgc,
                 ]);
 
-                $parentParagraph = null;
-                if ($this->getUnfurlUrl($attribute)->hasFetchedContent() && $element->parentNode->nodeName === 'p') {
-                    $parentParagraph = $element->parentNode;
-                    $parentParagraph->parentNode->insertBefore($element, $parentParagraph);
-                }
-
-                $htmlNodeProcessor->renameTag($element, $tagName);
-
-                if ($parentParagraph !== null && !$parentParagraph->hasChildNodes()) {
-                    /** @var \DOMElement $parentParagraph */
-                    $parentParagraph->remove();
+                if ($this->getUnfurlUrl($attribute)->isPlainUrl()) {
+                    $htmlNodeProcessor->renameTag($element, $tagName);
+                } else {
+                    $htmlNodeProcessor->renameTag(HtmlNodePlainLink::splitAtLink($element), $tagName);
                 }
             }
         }