Browse Source
Merge pull request #25238 from nextcloud/enh/noid/apps-defacto-in-root
Apps folder is defacto in root folder and not above
pull/25245/head
Roeland Jago Douma
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
9 deletions
-
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'])); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
