Delegate smiley HTML generation in HtmlOutputNodeImg to Smiley::getHtml()

Resolves #4153

diff --git a/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeImg.class.php b/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeImg.class.php
index f6439a609a6698a7e9cccdefe9f73013dfcceccc..72e1968c69601b8022eeb0e428d8dd87cd61c151 100644 (file)
--- a/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeImg.class.php
+++ b/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeImg.class.php
@@ -48,22 +48,11 @@ class HtmlOutputNodeImg extends AbstractHtmlOutputNode
                     // output as raw code instead
                     $htmlNodeProcessor->replaceElementWithText($element, ' ' . $code . ' ', false);
                 } else {
-                    // enforce database values for src, srcset and style
-                    $element->setAttribute('src', $smiley->getURL());
-
-                    if ($smiley->getHeight()) {
-                        $element->setAttribute('height', (string)$smiley->getHeight());
-                    } else {
-                        $element->removeAttribute('height');
-                    }
-
-                    if ($smiley->smileyPath2x) {
-                        $element->setAttribute('srcset', $smiley->getURL2x() . ' 2x');
-                    } else {
-                        $element->removeAttribute('srcset');
-                    }
-
-                    $element->setAttribute('title', WCF::getLanguage()->get($smiley->smileyTitle));
+                    // Ensure that the smiley's HTML is up to date.
+                    $doc = new \DOMDocument();
+                    $doc->loadHTML($smiley->getHtml());
+                    $smileyNode = $element->ownerDocument->importNode($doc->getElementsByTagName('img')->item(0), true);
+                    $element->parentNode->replaceChild($smileyNode, $element);
                 }
             } else {
                 $src = $element->getAttribute('src');