Use `height` attribute for smilies

diff --git a/wcfsetup/install/files/lib/data/smiley/Smiley.class.php b/wcfsetup/install/files/lib/data/smiley/Smiley.class.php
index 704e388f0165b0d06cee08aaf3c85bee94c46c35..7ea25ef14b25704393597d171ecd7f223e73f73c 100644 (file)
--- a/wcfsetup/install/files/lib/data/smiley/Smiley.class.php
+++ b/wcfsetup/install/files/lib/data/smiley/Smiley.class.php
@@ -70,8 +70,8 @@ class Smiley extends DatabaseObject {
        
        public function getHtml() {
                $srcset = ($this->smileyPath2x) ? ' srcset="' . StringUtil::encodeHTML($this->getURL2x()) . ' 2x"' : '';
-               $style = ($this->getHeight()) ? ' style="height: ' . $this->getHeight() . 'px"' : '';
+               $height = ($this->getHeight()) ? ' height="' . $this->getHeight() . '"' : '';
                
-               return '<img src="' . StringUtil::encodeHTML($this->getURL()) . '" alt="' . StringUtil::encodeHTML($this->smileyCode) . '" class="smiley"' . $srcset . $style . '>';
+               return '<img src="' . StringUtil::encodeHTML($this->getURL()) . '" alt="' . StringUtil::encodeHTML($this->smileyCode) . '" class="smiley"' . $srcset . $height . '>';
        }
 }

diff --git a/wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeImg.class.php b/wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeImg.class.php
index 9739473e07ab59c1799207eb5ff6bb29b4d68196..d4f6a8f01440e0768903ec7156da2cf1242ba9ad 100644 (file)
--- a/wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeImg.class.php
+++ b/wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeImg.class.php
@@ -87,8 +87,8 @@ class HtmlInputNodeImg extends AbstractHtmlInputNode {
                        // enforce database values for src, srcset and style
                        $element->setAttribute('src', $smiley->getURL());
                        
-                       if ($smiley->getHeight()) $element->setAttribute('style', 'height: ' . $smiley->getHeight() . 'px');
-                       else $element->removeAttribute('style');
+                       if ($smiley->getHeight()) $element->setAttribute('height', $smiley->getHeight());
+                       else $element->removeAttribute('height');
                        
                        if ($smiley->smileyPath2x) $element->setAttribute('srcset', $smiley->getURL2x() . ' 2x');
                        else $element->removeAttribute('srcset');

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 d2d9885d711e31285acd446c2c6f5a98a73d6677..15a5e3bfe3b89dcd36c364b1392831d9fdae5980 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
@@ -43,8 +43,8 @@ class HtmlOutputNodeImg extends AbstractHtmlOutputNode {
                                        // enforce database values for src, srcset and style
                                        $element->setAttribute('src', $smiley->getURL());
                                        
-                                       if ($smiley->getHeight()) $element->setAttribute('style', 'height: ' . $smiley->getHeight() . 'px');
-                                       else $element->removeAttribute('style');
+                                       if ($smiley->getHeight()) $element->setAttribute('height', $smiley->getHeight());
+                                       else $element->removeAttribute('height');
                                        
                                        if ($smiley->smileyPath2x) $element->setAttribute('srcset', $smiley->getURL2x() . ' 2x');
                                        else $element->removeAttribute('srcset');