Properly assigning a language id for like user activity events

diff --git a/wcfsetup/install/files/lib/data/like/LikeAction.class.php b/wcfsetup/install/files/lib/data/like/LikeAction.class.php
index ad0124053119d294d0ac524967f95d87849307d1..97f3b4f8bbff8d169deb8261ff50ba5dcb76df85 100644 (file)
--- a/wcfsetup/install/files/lib/data/like/LikeAction.class.php
+++ b/wcfsetup/install/files/lib/data/like/LikeAction.class.php
@@ -163,7 +163,7 @@ class LikeAction extends AbstractDatabaseObjectAction implements IGroupedUserLis
                // handle activity event
                if (UserActivityEventHandler::getInstance()->getObjectTypeID($this->objectType->objectType.'.recentActivityEvent')) {
                        if ($likeData['data']['liked'] == 1) {
-                               UserActivityEventHandler::getInstance()->fireEvent($this->objectType->objectType.'.recentActivityEvent', $this->parameters['data']['objectID']);
+                               UserActivityEventHandler::getInstance()->fireEvent($this->objectType->objectType.'.recentActivityEvent', $this->parameters['data']['objectID'], $this->likeableObject->getLanguageID());
                        }
                        else {
                                UserActivityEventHandler::getInstance()->removeEvents($this->objectType->objectType.'.recentActivityEvent', array($this->parameters['data']['objectID']));

diff --git a/wcfsetup/install/files/lib/data/like/object/AbstractLikeObject.class.php b/wcfsetup/install/files/lib/data/like/object/AbstractLikeObject.class.php
index 49808ee0680285cc0312351d47d0320b9c04e7e1..ec5421abba5f1193263cfccc1a9734fd247a154d 100644 (file)
--- a/wcfsetup/install/files/lib/data/like/object/AbstractLikeObject.class.php
+++ b/wcfsetup/install/files/lib/data/like/object/AbstractLikeObject.class.php
@@ -51,4 +51,11 @@ abstract class AbstractLikeObject extends DatabaseObjectDecorator implements ILi
        public function sendNotification(Like $like) {
                // individual implementations can override this method to provide notifications
        }
+       
+       /**
+        * @see \wcf\data\like\object\ILikeObject::getLanguageID()
+        */
+       public function getLanguageID() {
+               return null;
+       }
 }

diff --git a/wcfsetup/install/files/lib/data/like/object/ILikeObject.class.php b/wcfsetup/install/files/lib/data/like/object/ILikeObject.class.php
index dd8a9498dac485822e03a314dda24a4cc4841571..018189f87409e6aab4f71e2972c9d2f2b90b91f8 100644 (file)
--- a/wcfsetup/install/files/lib/data/like/object/ILikeObject.class.php
+++ b/wcfsetup/install/files/lib/data/like/object/ILikeObject.class.php
@@ -64,4 +64,11 @@ interface ILikeObject extends IDatabaseObjectProcessor, ITitledObject {
         * @param       \wcf\data\like\Like     $like
         */
        public function sendNotification(Like $like);
+       
+       /**
+        * Returns the language id of this object or its parent.
+        * 
+        * @return      integer
+        */
+       public function getLanguageID();
 }