Merge branch '5.5'

diff --cc com.woltlab.wcf/templates/article.tpl
index a4814cb41afae4be1c76e56179e8383a0bf8ad1e,044e5548703d7d8295e067a329737e06445ec0f8..bff67e0547f11a2bc76287f9bf74515fcea166b5
--- 1/com.woltlab.wcf/templates/article.tpl
--- 2/com.woltlab.wcf/templates/article.tpl
+++ b/com.woltlab.wcf/templates/article.tpl
@@@ -192,22 -190,12 +192,23 @@@
                                                </a>
                                        </li>
                                        {if $__wcf->session->getPermission('user.profile.canReportContent')}
 -                                              <li class="jsReportArticle jsOnly" data-object-id="{@$articleContent->articleID}"><a href="#" title="{lang}wcf.moderation.report.reportContent{/lang}" class="button jsTooltip"><span class="icon icon16 fa-exclamation-triangle"></span> <span class="invisible">{lang}wcf.moderation.report.reportContent{/lang}</span></a></li>
 +                                              <li>
 +                                                      <button
 +                                                              type="button"
 +                                                              title="{lang}wcf.moderation.report.reportContent{/lang}"
 +                                                              class="button jsTooltip"
 +                                                              data-report-content="com.woltlab.wcf.article"
 +                                                              data-object-id="{$articleContent->articleID}"
 +                                                      >
 +                                                              {icon name='triangle-exclamation'}
 +                                                              <span class="invisible">{lang}wcf.moderation.report.reportContent{/lang}</span>
 +                                                      </button>
 +                                              </li>
                                        {/if}
                                        {if MODULE_LIKE && ARTICLE_ENABLE_LIKE && $__wcf->session->getPermission('user.like.canLike') && $article->userID != $__wcf->user->userID}
 -                                              <li class="jsOnly"><span class="button reactButton{if $articleLikeData[$article->articleID]|isset && $articleLikeData[$article->articleID]->reactionTypeID} active{/if}" title="{lang}wcf.reactions.react{/lang}" data-reaction-type-id="{if $articleLikeData[$article->articleID]|isset && $articleLikeData[$article->articleID]->reactionTypeID}{$articleLikeData[$article->articleID]->reactionTypeID}{else}0{/if}"><span class="icon icon16 fa-smile-o"></span> <span class="invisible">{lang}wcf.reactions.react{/lang}</span></span></li>
 +                                              <li class="jsOnly"><span class="button reactButton{if $articleLikeData[$article->articleID]|isset && $articleLikeData[$article->articleID]->reactionTypeID} active{/if}" title="{lang}wcf.reactions.react{/lang}" data-reaction-type-id="{if $articleLikeData[$article->articleID]|isset && $articleLikeData[$article->articleID]->reactionTypeID}{$articleLikeData[$article->articleID]->reactionTypeID}{else}0{/if}">{icon name='face-smile'} <span class="invisible">{lang}wcf.reactions.react{/lang}</span></span></li>
                                        {/if}
+                                       {event name='articleLikeButtons'}
                                </ul>
                        </div>
                </div>