From dad98542a5a5b8df5b63074f0edea69008169f60 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 24 Mar 2016 09:32:11 +0100 Subject: We are only formatting an object when it's not null --- lib/private/activitymanager.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/private/activitymanager.php b/lib/private/activitymanager.php index 9258b7298cc..373105291dd 100644 --- a/lib/private/activitymanager.php +++ b/lib/private/activitymanager.php @@ -321,7 +321,8 @@ class ActivityManager implements IManager { * @return bool */ public function isFormattingFilteredObject() { - return $this->formattingObjectType === $this->request->getParam('object_type') + return $this->formattingObjectType !== null && $this->formattingObjectId !== null + && $this->formattingObjectType === $this->request->getParam('object_type') && $this->formattingObjectId === $this->request->getParam('object_id'); } -- cgit v1.2.3