UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-22 22:41:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1699 from pixelfed/staging

Browse source 
Update FollowController, fix private account bug
This commit is contained in:
daniel 2019-09-10 23:36:18 -06:00 committed by GitHub
commit ac83d9e61f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -6,10 +6,14 @@
### Fixed ### Fixed
- Fixed count bug in StatusHashtagService [#1694](https://github.com/pixelfed/pixelfed/pull/1694) - Fixed count bug in StatusHashtagService [#1694](https://github.com/pixelfed/pixelfed/pull/1694)
- Fixed private account bug [#1699](https://github.com/pixelfed/pixelfed/pull/1699)
### Changed ### Changed
- Updated EmailService, added new domains [#1690](https://github.com/pixelfed/pixelfed/pull/1690) - Updated EmailService, added new domains [#1690](https://github.com/pixelfed/pixelfed/pull/1690)
- Updated quill.js to v1.3.7 [#1692](https://github.com/pixelfed/pixelfed/pull/1690) - Updated quill.js to v1.3.7 [#1692](https://github.com/pixelfed/pixelfed/pull/1690)
## Deprecated
- Remove deprecated profile following/followers [#1697](https://github.com/pixelfed/pixelfed/pull/1697)
## [v0.10.3 (2019-09-08)](https://github.com/pixelfed/pixelfed/compare/v0.10.2...v0.10.3) ## [v0.10.3 (2019-09-08)](https://github.com/pixelfed/pixelfed/compare/v0.10.2...v0.10.3)

6
app/Http/Controllers/FollowerController.php
View file

@ -27,7 +27,11 @@ class FollowerController extends Controller
]); ]);
$item = (int) $request->input('item'); $item = (int) $request->input('item');
$this->handleFollowRequest($item); $this->handleFollowRequest($item);
return response()->json(200); if($request->wantsJson()) {
return response()->json(200);
} else {
return redirect()->back();
}
} }
protected function handleFollowRequest($item) protected function handleFollowRequest($item)