mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #25238 from nextcloud/enh/noid/apps-defacto-in-root 

Apps folder is defacto in root folder and not above
This commit is contained in:
Roeland Jago Douma 2021-01-21 09:08:54 +01:00 committed by GitHub
parent 15b0e4d922 5b0e69828f
commit d4d33e3095
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/base.php
View File

@ -211,25 +211,18 @@ class OC {
} }
} elseif (file_exists(OC::$SERVERROOT . '/apps')) { } elseif (file_exists(OC::$SERVERROOT . '/apps')) {
OC::$APPSROOTS[] = ['path' => OC::$SERVERROOT . '/apps', 'url' => '/apps', 'writable' => true]; OC::$APPSROOTS[] = ['path' => OC::$SERVERROOT . '/apps', 'url' => '/apps', 'writable' => true];
} elseif (file_exists(OC::$SERVERROOT . '/../apps')) {
OC::$APPSROOTS[] = [
'path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps',
'url' => '/apps',
'writable' => true
];
} }
if (empty(OC::$APPSROOTS)) { if (empty(OC::$APPSROOTS)) {
throw new \RuntimeException('apps directory not found! Please put the Nextcloud apps folder in the Nextcloud folder' throw new \RuntimeException('apps directory not found! Please put the Nextcloud apps folder in the Nextcloud folder'
. ' or the folder above. You can also configure the location in the config.php file.'); . '. You can also configure the location in the config.php file.');
} }
$paths = []; $paths = [];
foreach (OC::$APPSROOTS as $path) { foreach (OC::$APPSROOTS as $path) {
$paths[] = $path['path']; $paths[] = $path['path'];
if (!is_dir($path['path'])) { if (!is_dir($path['path'])) {
throw new \RuntimeException(sprintf('App directory "%s" not found! Please put the Nextcloud apps folder in the' throw new \RuntimeException(sprintf('App directory "%s" not found! Please put the Nextcloud apps folder in the'
. ' Nextcloud folder or the folder above. You can also configure the location in the' . ' Nextcloud folder. You can also configure the location in the config.php file.', $path['path']));
. ' config.php file.', $path['path']));
} }
} }