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

Merge pull request #4289 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2023-04-09 20:07:35 -06:00 committed by GitHub
commit 8df792cb54
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -20,6 +20,8 @@
- Update StatusController, allow users to delete replies to posts ([738925c2](https://github.com/pixelfed/pixelfed/commit/738925c2)) - Update StatusController, allow users to delete replies to posts ([738925c2](https://github.com/pixelfed/pixelfed/commit/738925c2))
- Update admin autospam/report email templates, remove image previews ([76be49ac](https://github.com/pixelfed/pixelfed/commit/76be49ac)) - Update admin autospam/report email templates, remove image previews ([76be49ac](https://github.com/pixelfed/pixelfed/commit/76be49ac))
- Update LandingService, enable landing directory/explore feed by default and move configuration to config/instance.php file ([780f2507](https://github.com/pixelfed/pixelfed/commit/780f2507)) - Update LandingService, enable landing directory/explore feed by default and move configuration to config/instance.php file ([780f2507](https://github.com/pixelfed/pixelfed/commit/780f2507))
- Update ImageOptimizePipeline, improve support for disabling image optimizations ([e76289e4](https://github.com/pixelfed/pixelfed/commit/e76289e4))
- Update LandingController, fix configonfig variable names ([b716926b](https://github.com/pixelfed/pixelfed/commit/b716926b))
- ([](https://github.com/pixelfed/pixelfed/commit/)) - ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.5 (2023-03-25)](https://github.com/pixelfed/pixelfed/compare/v0.11.4...v0.11.5) ## [v0.11.5 (2023-03-25)](https://github.com/pixelfed/pixelfed/compare/v0.11.4...v0.11.5)

4
app/Http/Controllers/LandingController.php
View file

@ -26,14 +26,14 @@ class LandingController extends Controller
return redirect('/'); return redirect('/');
} }
abort_if(config_cache('landing.show_explore_feed') != 1, 404); abort_if(config('instance.landing.show_explore') == false, 404);
return view('site.index'); return view('site.index');
} }
public function getDirectoryApi(Request $request) public function getDirectoryApi(Request $request)
{ {
abort_if(config_cache('landing.show_directory') != 1, 404); abort_if(config('instance.landing.show_directory') == false, 404);
return DirectoryProfile::collection( return DirectoryProfile::collection(
Profile::whereNull('domain') Profile::whereNull('domain')