Fixed smilies being recognized as images

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 e08490332c8139c21175b5dbc82c55e9958faa91..d0698d47ec4f6bbf71d6af41667e0f3e82f6ff06 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
@@ -26,7 +26,27 @@ class HtmlInputNodeImg extends AbstractHtmlInputNode {
         * @inheritDoc
         */
        public function isAllowed(AbstractHtmlNodeProcessor $nodeProcessor) {
-               return BBCodeHandler::getInstance()->isAvailableBBCode('img') ? [] : ['img'];
+               if (BBCodeHandler::getInstance()->isAvailableBBCode('img')) {
+                       return [];
+               }
+               
+               $foundImage = false;
+               
+               // check if there are only attachments, media or smilies
+               /** @var \DOMElement $element */
+               foreach ($nodeProcessor->getDocument()->getElementsByTagName('img') as $element) {
+                       $class = $element->getAttribute('class');
+                       if (!preg_match('~\b(?:woltlabAttachment|woltlabSuiteMedia|smiley)\b~', $class)) {
+                               $foundImage = true;
+                               break;
+                       }
+               }
+               
+               if (!$foundImage) {
+                       return [];
+               }
+               
+               return ['img'];
        }
        
        /**