Merge branch 'master' into next

diff --cc com.woltlab.wcf/templates/__messageFormSmilies.tpl
index bb35e8e2e40f0dae3f7d19166400b50724153fc1,51e429a19391aee0da3d8447df06b91112e8e21d..d17bafa27522d704dbfe588749e1437562975b6f
--- 1/com.woltlab.wcf/templates/__messageFormSmilies.tpl
--- 2/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>

diff --cc wcfsetup/install/files/lib/data/smiley/Smiley.class.php
Simple merge