summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/private/activitymanager.php3
1 files changed, 2 insertions, 1 deletions
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');
}