From c14276abbbbe16a476ae409800cddbb115a7be44 Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Tue, 13 Apr 2021 14:12:49 +0200 Subject: [PATCH] Fix code style after merge --- .../files/lib/system/clipboard/ClipboardHandler.class.php | 2 +- wcfsetup/install/files/lib/util/DOMUtil.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wcfsetup/install/files/lib/system/clipboard/ClipboardHandler.class.php b/wcfsetup/install/files/lib/system/clipboard/ClipboardHandler.class.php index 4e16783749..80fb8610d1 100644 --- a/wcfsetup/install/files/lib/system/clipboard/ClipboardHandler.class.php +++ b/wcfsetup/install/files/lib/system/clipboard/ClipboardHandler.class.php @@ -391,7 +391,7 @@ class ClipboardHandler extends SingletonFactory 'reloadPageOnSuccess' => $clipboardAction->getReloadPageOnSuccess(), ]; } else { - $editorData[$typeName]['reloadPageOnSuccess'] = array_unique(array_merge( + $editorData[$typeName]['reloadPageOnSuccess'] = \array_unique(\array_merge( $editorData[$typeName]['reloadPageOnSuccess'], $clipboardAction->getReloadPageOnSuccess() )); diff --git a/wcfsetup/install/files/lib/util/DOMUtil.class.php b/wcfsetup/install/files/lib/util/DOMUtil.class.php index 69bf0e842b..c436edec78 100644 --- a/wcfsetup/install/files/lib/util/DOMUtil.class.php +++ b/wcfsetup/install/files/lib/util/DOMUtil.class.php @@ -502,7 +502,7 @@ final class DOMUtil public static function removeNode(\DOMNode $node, $preserveChildNodes = false) { $parent = $node->parentNode ?: $node->ownerDocument; - + if ($preserveChildNodes) { if (!($node instanceof \DOMElement)) { throw new \InvalidArgumentException("Preserving child nodes is only supported for DOMElement."); -- 2.20.1