From: Matthias Schmidt <gravatronics@live.com>
Date: Sun, 7 Apr 2019 14:47:59 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 5.2.0_Alpha_1~163
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f4ba31324cc716c1d3e7a11bb9a121eed6320214;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

f4ba31324cc716c1d3e7a11bb9a121eed6320214
diff --cc com.woltlab.wcf/templates/__messageFormSmilies.tpl
index bb35e8e2e4,51e429a193..d17bafa275
--- a/com.woltlab.wcf/templates/__messageFormSmilies.tpl
+++ b/com.woltlab.wcf/templates/__messageFormSmilies.tpl
@@@ -1,5 -1,5 +1,5 @@@
  <ul class="inlineList smileyList">
 -	{foreach from=$smilies item=smiley}
 -		<li><a class="jsSmiley">{@$smiley->getHtml('jsTooltip')}</a></li>
 +	{foreach from=$smilies item=smiley name=smilies}
- 		<li><a title="{lang}{$smiley->smileyTitle}{/lang}" class="jsTooltip jsSmiley" role="button" tabindex="{if $tpl.foreach.smilies.iteration === 1}0{else}-1{/if}">{@$smiley->getHtml()}</a></li>
++		<li><a class="jsSmiley" role="button" tabindex="{if $tpl.foreach.smilies.iteration === 1}0{else}-1{/if}">{@$smiley->getHtml('jsTooltip')}</a></li>
  	{/foreach}
 -</ul>
 +</ul>