From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 24 Feb 2015 10:25:52 +0000 (+0100)
Subject: Slightly improved smiley detection
X-Git-Tag: 2.1.0~41
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4539f5c6ff3d821ce767957630faa7c7df87ba91;p=GitHub%2FWoltLab%2FWCF.git

Slightly improved smiley detection
---

diff --git a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
index 43f0f8b9e2..37c3ce522e 100644
--- a/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
@@ -554,8 +554,8 @@ RedactorPlugins.wbbcode = function() {
 			});
 			
 			// smileys
-			html = html.replace(/ ?<img [^>]*?alt="([^"]+?)" class="smiley".*?> ?/gi, ' $1 '); // firefox
-			html = html.replace(/ ?<img [^>]*?class="smiley" alt="([^"]+?)".*?> ?/gi, ' $1 '); // chrome, ie
+			html = html.replace(/ ?<img [^>]*?alt="([^"]+?)".*?class="smiley".*?> ?/gi, ' $1 '); // firefox
+			html = html.replace(/ ?<img [^>]*?class="smiley".*?alt="([^"]+?)".*?> ?/gi, ' $1 '); // chrome, ie
 			
 			// attachments
 			html = html.replace(/<img(.*?)class="[^"]*redactorEmbeddedAttachment[^"]*"(.*?)>/gi, function(match, attributesBefore, attributesAfter) {