upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-24 02:11:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Merge pull request #23821 from nextcloud/td/enh/no_fs_setup_by_default

Browse source 
Do not setup the default FS on normal routes
This commit is contained in:
Morris Jobke 2020-11-06 23:03:09 +01:00 committed by GitHub
commit 1a30e4d28f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/files/lib/Controller/AjaxController.php
View file

@ -41,6 +41,7 @@ class AjaxController extends Controller {
* @NoAdminRequired
*/
public function getStorageStats(string $dir = '/'): JSONResponse {
\OC_Util::setupFS();
try {
return new JSONResponse([
'status' => 'success',

1
apps/files/lib/Controller/ViewController.php
View file

@ -134,6 +134,7 @@ class ViewController extends Controller {
* @throws \OCP\Files\NotFoundException
*/
protected function getStorageInfo() {
\OC_Util::setupFS();
$dirInfo = \OC\Files\Filesystem::getFileInfo('/', false);
return \OC_Helper::getStorageInfo('/', $dirInfo);

1
lib/base.php
View file

@ -1006,7 +1006,6 @@ class OC {
OC_App::loadApps(['filesystem', 'logging']);
OC_App::loadApps();
}
OC_Util::setupFS();
OC::$server->getRouter()->match(\OC::$server->getRequest()->getRawPathInfo());
return;
} catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {