From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 19 Jan 2018 13:57:48 +0000 (+0100)
Subject: Skip smiley detection if smilies have been disabled
X-Git-Tag: 3.1.0_RC_2~33
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9a06930ae1984b5475c18bd9fc3a7f05f462b47f;p=GitHub%2FWoltLab%2FWCF.git

Skip smiley detection if smilies have been disabled
---

diff --git a/wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeTextParser.class.php b/wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeTextParser.class.php
index 5554dbc427..95c5ab7751 100644
--- a/wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeTextParser.class.php
+++ b/wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeTextParser.class.php
@@ -200,7 +200,7 @@ class HtmlInputNodeTextParser {
 				$value = $this->parseEmail($node, $value);
 			}
 			
-			if ($this->smileyCount !== 50) {
+			if (MODULE_SMILEY && $this->smileyCount !== 50) {
 				$value = $this->parseSmiley($node, $value);
 			}