chris/pixelfed
1
0
Fork 0
forked from mirror/pixelfed
Code Pull requests Activity

Merge pull request #2391 from pixelfed/staging

Browse source 
Update NotificationTransformer, fixes #2389
This commit is contained in:
daniel 2020-08-24 18:56:36 -06:00 committed by GitHub
commit 307b946503
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -89,6 +89,7 @@
- Updated DiscoverController, fixes ([#2378](https://github.com/pixelfed/pixelfed/issues/2378)). ([8e7f4f9d](https://github.com/pixelfed/pixelfed/commit/8e7f4f9d))
- Updated SearchController, update version. ([8d923d77](https://github.com/pixelfed/pixelfed/commit/8d923d77))
- Updated email confirmation middleware, add 2FA to allow list. Fixes ([#2385](https://github.com/pixelfed/pixelfed/issues/2385)). ([27f3b29c](https://github.com/pixelfed/pixelfed/commit/27f3b29c))
- Updated NotificationTransformer, fixes ([#2389](https://github.com/pixelfed/pixelfed/issues/2389)). ([c4506ebd](https://github.com/pixelfed/pixelfed/commit/c4506ebd))
## [v0.10.9 (2020-04-17)](https://github.com/pixelfed/pixelfed/compare/v0.10.8...v0.10.9)
### Added

4
app/Transformer/Api/Mastodon/v1/NotificationTransformer.php
View file

@ -37,10 +37,10 @@ class NotificationTransformer extends Fractal\TransformerAbstract
if($status) {
return $this->item($status, new StatusTransformer());
} else {
return $this->collection([], new StatusTransformer());
return;
}
} else {
return $this->collection([], new StatusTransformer());
return;
}
}