From: Marcel Werk <burntime@woltlab.com>
Date: Mon, 24 Feb 2014 02:49:17 +0000 (+0100)
Subject: Fixed smiley issue
X-Git-Tag: 2.0.3~14
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f12321dc9d7ac93bad5136bcb6e672c9c64a11cb;p=GitHub%2FWoltLab%2FWCF.git

Fixed smiley issue
---

diff --git a/com.woltlab.wcf/templates/__messageFormSmilies.tpl b/com.woltlab.wcf/templates/__messageFormSmilies.tpl
index 5efac62bc8..a4204abeba 100644
--- a/com.woltlab.wcf/templates/__messageFormSmilies.tpl
+++ b/com.woltlab.wcf/templates/__messageFormSmilies.tpl
@@ -1,5 +1,5 @@
 <ul class="smileyList">
 	{foreach from=$smilies item=smiley}
-		<li><a title="{lang}{$smiley->smileyTitle}{/lang}" class="jsTooltip jsSmiley" data-smiley-code="{$smiley->smileyCode}"><img src="{$smiley->getURL()}" alt="{$smiley->smileyCode}" /></a></li>
+		<li><a title="{lang}{$smiley->smileyTitle}{/lang}" class="jsTooltip jsSmiley" data-smiley-code="{$smiley->smileyCode}" data-smiley-path="{$smiley->smileyPath}"><img src="{$smiley->getURL()}" alt="{$smiley->smileyCode}" /></a></li>
 	{/foreach}
 </ul>
\ No newline at end of file
diff --git a/wcfsetup/install/files/js/WCF.Message.js b/wcfsetup/install/files/js/WCF.Message.js
index e4927d79f0..4644e6de60 100644
--- a/wcfsetup/install/files/js/WCF.Message.js
+++ b/wcfsetup/install/files/js/WCF.Message.js
@@ -544,11 +544,10 @@ WCF.Message.Smilies = Class.extend({
 	_smileyClick: function(event) {
 		var $target = $(event.currentTarget);
 		var $smileyCode = $target.data('smileyCode');
+		var $smileyPath = $target.data('smileyPath');
 		
 		// get ckEditor
 		var $ckEditor = this._ckEditor.ckeditorGet();
-		// get smiley path
-		var $smileyPath = $target.find('img').attr('src');
 		
 		// add smiley to config
 		if (!WCF.inArray($smileyCode, $ckEditor.config.smiley_descriptions)) {
@@ -560,7 +559,7 @@ WCF.Message.Smilies = Class.extend({
 			// in design mode
 			var $img = $ckEditor.document.createElement('img', {
 				attributes: {
-					src: $smileyPath,
+					src: $ckEditor.config.smiley_path + $smileyPath,
 					'class': 'smiley',
 					alt: $smileyCode
 				}