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

Merge pull request #3446 from pixelfed/staging 

Remove arbitrary metro url redirect timeout
This commit is contained in:
daniel 2022-05-14 00:00:20 -06:00 committed by GitHub
parent ecf63f8d26 2066c36fef
commit cfce080cba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -7,6 +7,7 @@
- Enforce UTC in incoming activities ([18931a1f](https://github.com/pixelfed/pixelfed/commit/18931a1f)) - Enforce UTC in incoming activities ([18931a1f](https://github.com/pixelfed/pixelfed/commit/18931a1f))
- Add storage flags to admin dashboard diagnostics ([#3444](https://github.com/pixelfed/pixelfed/pull/3444)) - Add storage flags to admin dashboard diagnostics ([#3444](https://github.com/pixelfed/pixelfed/pull/3444))
- Hardcode UTC application timezone to prevent timezone issues ([b0d2c5e1](https://github.com/pixelfed/pixelfed/commit/b0d2c5e1)) - Hardcode UTC application timezone to prevent timezone issues ([b0d2c5e1](https://github.com/pixelfed/pixelfed/commit/b0d2c5e1))
- Remove arbitrary metro url redirect timeout ([84209c24](https://github.com/pixelfed/pixelfed/commit/84209c24))
## [v0.11.3 (2022-05-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.2...v0.11.3) ## [v0.11.3 (2022-05-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.2...v0.11.3)

3
app/Http/Controllers/SpaController.php
View File

@ -35,7 +35,6 @@ class SpaController extends Controller
isset($post['local']) && isset($post['local']) &&
$post['local'] === true $post['local'] === true
) { ) {
sleep(5);
return redirect($post['url']); return redirect($post['url']);
} }
@ -55,8 +54,6 @@ class SpaController extends Controller
$account = AccountService::get($id); $account = AccountService::get($id);
sleep(5);
if($account && isset($account['url']) && $account['local']) { if($account && isset($account['url']) && $account['local']) {
return redirect($account['url']); return redirect($account['url']);
} }