Merge pull request #5733 from WoltLab/no-serialize-reaction

Don't serialize reaction
WoltLab · Dec 18, 2023 · a275a7c · a275a7c
2 parents 7ea0236 + 690741e
commit a275a7c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/wcfsetup/install/files/lib/system/reaction/ReactionHandler.class.php b/wcfsetup/install/files/lib/system/reaction/ReactionHandler.class.php
@@ -406,7 +406,11 @@ public function react(ILikeObject $likeable, User $user, $reactionTypeID, $time
                         $likeable->getLanguageID(),
                         $user->userID,
                         TIME_NOW,
-                        ['reactionType' => $reaction]
+                        [
+                            'reactionTypeID' => $reaction->reactionTypeID,
+                            /* @deprecated 6.1 use `reactionTypeID` */
+                            'reactionType' => $reaction,
+                        ]
                     );
                 }
             }

diff --git a/...p/install/files/lib/system/user/activity/event/LikeableArticleUserActivityEvent.class.php b/...p/install/files/lib/system/user/activity/event/LikeableArticleUserActivityEvent.class.php
@@ -3,6 +3,7 @@
 namespace wcf\system\user\activity\event;
 
 use wcf\data\article\ViewableArticleList;
+use wcf\system\reaction\ReactionHandler;
 use wcf\system\SingletonFactory;
 use wcf\system\WCF;
 
@@ -50,7 +51,9 @@ public function prepare(array $events)
                 // short output
                 $text = WCF::getLanguage()->getDynamicVariable('wcf.article.recentActivity.likedArticle', [
                     'article' => $article,
-                    'reactionType' => $event->reactionType,
+                    'reactionType' => ReactionHandler::getInstance()->getReactionTypeByID(
+                        $event->reactionTypeID ?? $event->reactionType->reactionTypeID
+                    ),
                 ]);
                 $event->setTitle($text);