diff options
| author | Joas Schilling <nickvergessen@owncloud.com> | 2016-03-24 11:32:11 +0300 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@owncloud.com> | 2016-03-29 10:11:48 +0300 |
| commit | 1733b6e8c87069ab903d8e09c1fd457c76e60f71 (patch) | |
| tree | 237df213ed66c061e0cec1d9eb33a122d8520890 /lib | |
| parent | 03f461591e5d20c7d0e25df7c997b855f1e797e4 (diff) | |
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'); } |