diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2021-01-21 09:08:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-21 09:08:54 +0100 |
| commit | d4d33e3095fb5d0797ec7c3bb8c93c2d1c905ade (patch) | |
| tree | 3f8376b75a2a05921457fb34fba8598afcd2ce89 /lib | |
| parent | 15b0e4d922cda3ca494fb529f79d13802437522d (diff) | |
| parent | 5b0e69828f55d48f0bbf4960f15263896f2c62d7 (diff) | |
| download | nextcloud-server-d4d33e3095fb5d0797ec7c3bb8c93c2d1c905ade.tar.gz nextcloud-server-d4d33e3095fb5d0797ec7c3bb8c93c2d1c905ade.zip | |
Merge pull request #25238 from nextcloud/enh/noid/apps-defacto-in-root
Apps folder is defacto in root folder and not above
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 06ab54299ee..c42f427ca40 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'])); } } |