Revert "Strip the `loading` attribute from smileys for AMP output"

This reverts commit 4cfc175da480a13704dd6b52e49723c9a84cb62d.

diff --git a/wcfsetup/install/files/lib/data/smiley/Smiley.class.php b/wcfsetup/install/files/lib/data/smiley/Smiley.class.php
index 4518cca9c78871c9cfa23a8283eb8b8ec709049b..20bc1a772666bf1f3b96632a77e8f7a09a519b0a 100644 (file)
--- a/wcfsetup/install/files/lib/data/smiley/Smiley.class.php
+++ b/wcfsetup/install/files/lib/data/smiley/Smiley.class.php
@@ -128,10 +128,9 @@ class Smiley extends DatabaseObject implements ITitledObject
      * Returns the html code to render the smiley.
      *
      * @param string $class (additional) class(es) of the smiley element
-     * @param bool $isAmp
      * @return  string
      */
-    public function getHtml($class = '', $isAmp = false)
+    public function getHtml($class = '')
     {
         $srcset = ($this->smileyPath2x) ? ' srcset="' . StringUtil::encodeHTML($this->getURL2x()) . ' 2x"' : '';
         $height = ($this->getHeight()) ? ' height="' . $this->getHeight() . '"' : '';
@@ -140,8 +139,6 @@ class Smiley extends DatabaseObject implements ITitledObject
             $class = ' ' . $class;
         }
 
-        $loading = ($isAmp) ? '' : ' loading="eager"';
-
-        return '<img src="' . StringUtil::encodeHTML($this->getURL()) . '" alt="' . StringUtil::encodeHTML($this->smileyCode) . '" title="' . WCF::getLanguage()->get($this->smileyTitle) . '" class="smiley' . $class . '"' . $srcset . $height . $width . $loading . '>';
+        return '<img src="' . StringUtil::encodeHTML($this->getURL()) . '" alt="' . StringUtil::encodeHTML($this->smileyCode) . '" title="' . WCF::getLanguage()->get($this->smileyTitle) . '" class="smiley' . $class . '"' . $srcset . $height . $width . ' loading="eager">';
     }
 }

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 b2091371808153612ace2f09cc9c4def98179d6c..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
@@ -36,8 +36,6 @@ class HtmlOutputNodeImg extends AbstractHtmlOutputNode
      */
     public function process(array $elements, AbstractHtmlNodeProcessor $htmlNodeProcessor)
     {
-        $isAmp = ($htmlNodeProcessor instanceof AmpHtmlOutputNodeProcessor);
-
         /** @var \DOMElement $element */
         foreach ($elements as $element) {
             $class = $element->getAttribute('class');
@@ -52,7 +50,7 @@ class HtmlOutputNodeImg extends AbstractHtmlOutputNode
                 } else {
                     // Ensure that the smiley's HTML is up to date.
                     $doc = new \DOMDocument();
-                    $doc->loadHTML($smiley->getHtml('', $isAmp));
+                    $doc->loadHTML($smiley->getHtml());
                     $smileyNode = $element->ownerDocument->importNode($doc->getElementsByTagName('img')->item(0), true);
                     $element->parentNode->replaceChild($smileyNode, $element);
                 }