From 377f389b7f72a8e6548a3f3b2e173cd5613ee3f0 Mon Sep 17 00:00:00 2001
From: Cyperghost <olaf_schmitz_1@t-online.de>
Date: Mon, 22 Jan 2024 12:00:59 +0100
Subject: [PATCH] Simplify the code

---
 .../node/HtmlInputNodeProcessor.class.php     | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeProcessor.class.php b/wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeProcessor.class.php
index 5b794e2b1e..4a54c26943 100644
--- a/wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeProcessor.class.php
+++ b/wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeProcessor.class.php
@@ -810,24 +810,22 @@ class HtmlInputNodeProcessor extends AbstractHtmlNodeProcessor
                     $nextSibling = $this->getNonEmptyNode($parentLinkElement, 'nextSibling');
                     $previousSibling = $this->getNonEmptyNode($parentLinkElement, 'previousSibling');
 
-                    // Check whether the link is at the beginning or end of the paragraph
-                    // and whether the next or previous sibling is a line break.
+                    // Check whether the link is the only content in the line.
+                    // To do this, we need to check whether the next/previous sibling is a `<br>' element or
+                    // is the start/end of the paragraph.
                     // <p><a href="https://example.com">https://example.com</a><br>…</p>
                     // <p>…<br><a href="https://example.com">https://example.com</a></p>
-                    if (
-                        ($nextSibling === null && $previousSibling !== null && $previousSibling->nodeName === 'br')
-                        || ($previousSibling === null && $nextSibling !== null && $nextSibling->nodeName === 'br')
-                    ) {
-                        $this->plainLinks[] = $plainLink->setIsStandalone($parent, false);
-                        continue;
-                    }
-                    // If not, the previous and next sibling may be a line break.
                     // <p>…<br><a href="https://example.com">https://example.com</a><br>…</p>
                     // <p>…<br><u><b><a href="https://example.com">https://example.com</a></b></u><br>…</p>
-                    if (
-                        $previousSibling !== null && $nextSibling !== null
-                        && $previousSibling->nodeName === 'br' && $nextSibling->nodeName === 'br'
-                    ) {
+
+                    if ($nextSibling !== null && $nextSibling->nodeName === 'br') {
+                        $nextSibling = null;
+                    }
+                    if ($previousSibling !== null && $previousSibling->nodeName === 'br') {
+                        $previousSibling = null;
+                    }
+
+                    if ($nextSibling === null && $previousSibling === null) {
                         $this->plainLinks[] = $plainLink->setIsStandalone($parent, false);
                         continue;
                     }
-- 
2.20.1