From f3b5fd4030dd04985a87ec7cca8cd1fc488fb781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Thu, 4 Jul 2019 20:53:27 +0200 Subject: [PATCH] Do not overwrite activity object with stripped down card data Fix check for after data MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl Signed-off-by: Julius Härtl --- js/controller/ActivityController.js | 2 +- lib/Activity/ActivityManager.php | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/js/controller/ActivityController.js b/js/controller/ActivityController.js index c521067ff..018e0fbf5 100644 --- a/js/controller/ActivityController.js +++ b/js/controller/ActivityController.js @@ -284,7 +284,7 @@ class ActivityController { parseMessage(activity) { let subject = activity.subject_rich[0]; let parameters = activity.subject_rich[1]; - if (parameters.after && parameters.after.id && parameters.after.id.startsWith('dt:')) { + if (parameters.after && typeof parameters.after.id === 'string' && parameters.after.id.startsWith('dt:')) { let dateTime = parameters.after.id.substr(3); parameters.after.name = moment(dateTime).format('L LTS'); } diff --git a/lib/Activity/ActivityManager.php b/lib/Activity/ActivityManager.php index e90aa61b0..641c34a7a 100644 --- a/lib/Activity/ActivityManager.php +++ b/lib/Activity/ActivityManager.php @@ -358,14 +358,12 @@ class ActivityManager { case self::SUBJECT_CARD_USER_ASSIGN: case self::SUBJECT_CARD_USER_UNASSIGN: $subjectParams = $this->findDetailsForCard($entity->getId(), $subject); - $object = $entity; break; case self::SUBJECT_ATTACHMENT_CREATE: case self::SUBJECT_ATTACHMENT_UPDATE: case self::SUBJECT_ATTACHMENT_DELETE: case self::SUBJECT_ATTACHMENT_RESTORE: $subjectParams = $this->findDetailsForAttachment($entity->getId()); - $object = $subjectParams['card']; break; case self::SUBJECT_BOARD_SHARE: case self::SUBJECT_BOARD_UNSHARE: