From: Matthias Schmidt <gravatronics@live.com>
Date: Sun, 3 Jan 2021 16:20:22 +0000 (+0100)
Subject: Merge branch '5.2' into 5.3
X-Git-Tag: 5.3.2~6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0b4f3960b274aaca542f9553d66e39087111cca8;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '5.2' into 5.3
---

0b4f3960b274aaca542f9553d66e39087111cca8
diff --cc com.woltlab.wcf/userNotificationEvent.xml
index 3a6d8bb871,9e261f7093..5d3d3b1e2c
--- a/com.woltlab.wcf/userNotificationEvent.xml
+++ b/com.woltlab.wcf/userNotificationEvent.xml
@@@ -113,14 -116,8 +116,15 @@@
  			<objecttype>com.woltlab.wcf.article.notification</objecttype>
  			<classname>wcf\system\user\notification\event\ArticleUserNotificationEvent</classname>
  			<preset>1</preset>
+ 			<options>module_article</options>
  		</event>
 +		<event>
 +			<name>like</name>
 +			<objecttype>com.woltlab.wcf.likeableArticle.notification</objecttype>
 +			<classname>wcf\system\user\notification\event\ArticleLikeUserNotificationEvent</classname>
 +			<options>module_like</options>
 +			<preset>1</preset>
 +		</event>
  		
  		<event>
  			<name>registration</name>