From 5b0e69828f55d48f0bbf4960f15263896f2c62d7 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 20 Jan 2021 21:22:39 +0100 Subject: [PATCH] Apps folder is defacto in root folder and not above Signed-off-by: Morris Jobke --- lib/base.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/lib/base.php b/lib/base.php index f5b9964b1f..f81c7eb92c 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'])); } }