diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2021-01-20 21:22:39 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2021-01-20 21:22:39 +0100 |
| commit | 5b0e69828f55d48f0bbf4960f15263896f2c62d7 (patch) | |
| tree | edd94856eedfe0f44efdfd1a8cd00be89bef4089 /lib | |
| parent | 4c81f5c4ad3942cd8f4b8e9e67b956c0181ac435 (diff) | |
| download | nextcloud-server-5b0e69828f55d48f0bbf4960f15263896f2c62d7.tar.gz nextcloud-server-5b0e69828f55d48f0bbf4960f15263896f2c62d7.zip | |
Apps folder is defacto in root folder and not above
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/base.php b/lib/base.php index f5b9964b1f8..f81c7eb92cb 100644 --- a/lib/base.php +++ b/lib/base.php @@ -211,25 +211,18 @@ class OC { } } elseif (file_exists(OC::$SERVERROOT . '/apps')) { 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)) { 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 = []; foreach (OC::$APPSROOTS as $path) { $paths[] = $path['path']; if (!is_dir($path['path'])) { 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' - . ' config.php file.', $path['path'])); + . ' Nextcloud folder. You can also configure the location in the config.php file.', $path['path'])); } } |