diff options
| author | Joas Schilling <nickvergessen@owncloud.com> | 2016-03-24 09:32:11 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@owncloud.com> | 2016-03-24 09:34:19 +0100 |
| commit | dad98542a5a5b8df5b63074f0edea69008169f60 (patch) | |
| tree | bba77e48085f529cce3b6f773fffbb2d46ad2936 /lib | |
| parent | 4b3af9dfe781dc875f3bf94cd31e658ef1d707a9 (diff) | |
| download | nextcloud-server-dad98542a5a5b8df5b63074f0edea69008169f60.tar.gz nextcloud-server-dad98542a5a5b8df5b63074f0edea69008169f60.zip | |
We are only formatting an object when it's not null
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/activitymanager.php | 3 |
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'); } |