Merge branch 'master' into font-awesome-6-migration

diff --cc com.woltlab.wcf/templates/categoryArticleList.tpl
index e8af78ebe7da611cfdd184ea086516f606d205f8,249bca68d1d686b5538db540d8cba5ed94f0b8fe..ab9299d17d590e8372e825efa7fec43ed8ded33c
--- 1/com.woltlab.wcf/templates/categoryArticleList.tpl
--- 2/com.woltlab.wcf/templates/categoryArticleList.tpl
+++ b/com.woltlab.wcf/templates/categoryArticleList.tpl
@@@ -63,11 -63,10 +63,10 @@@
  {/capture}
  
  {capture assign='contentInteractionButtons'}
-       {if $__wcf->user->userID}
-               <a href="#" class="contentInteractionButton jsSubscribeButton jsOnly button small{if $category->isSubscribed()} active{/if}" data-object-type="com.woltlab.wcf.article.category" data-object-id="{@$category->categoryID}"><span class="icon icon16 fa-bookmark{if !$category->isSubscribed()}-o{/if}"></span> <span>{lang}wcf.user.objectWatch.button.subscribe{/lang}</span></a>
-       {/if}
+       {include file='__userObjectWatchButton' isSubscribed=$category->isSubscribed() objectType='com.woltlab.wcf.article.category' objectID=$category->categoryID}
+       
        {if ARTICLE_ENABLE_VISIT_TRACKING}
 -              <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly"><span class="icon icon16 fa-check"></span> <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
 +              <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{icon size=16 name='check'} <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
        {/if}
  {/capture}