From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 18 Aug 2022 16:39:07 +0000 (+0200)
Subject: Merge branch 'master' into font-awesome-6-migration
X-Git-Tag: 6.0.0_Alpha_1~1024^2~2^2~37
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e57e8db431643711fd771b8f7cbc38e864a1533c;p=GitHub%2FWoltLab%2FWCF.git

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

e57e8db431643711fd771b8f7cbc38e864a1533c
diff --cc com.woltlab.wcf/templates/categoryArticleList.tpl
index e8af78ebe7,249bca68d1..ab9299d17d
--- a/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}