summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-03-24 11:56:43 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-03-24 11:56:43 +0100
commit789df4d63041d5ffb46f71e33172dd42450b4bc8 (patch)
tree9717789d0969f2a5c63a8e82d2ef95ceb403fa53 /lib
parenta355e3abe383ea3fbb955db2efa2d10dc07268e5 (diff)
parent117b3e0a12e2397562eb737f01bf8793143db5e7 (diff)
downloadnextcloud-server-789df4d63041d5ffb46f71e33172dd42450b4bc8.tar.gz
nextcloud-server-789df4d63041d5ffb46f71e33172dd42450b4bc8.zip
Merge pull request #23542 from owncloud/catch-empty-app-path-oh-we-really-should-use-exceptions-in-the-future
getAppPath can return false
Diffstat (limited to 'lib')
-rw-r--r--lib/private/route/router.php9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/private/route/router.php b/lib/private/route/router.php
index 03bee3d2037..ef02b5aba0e 100644
--- a/lib/private/route/router.php
+++ b/lib/private/route/router.php
@@ -95,9 +95,12 @@ class Router implements IRouter {
if (!isset($this->routingFiles)) {
$this->routingFiles = [];
foreach (\OC_APP::getEnabledApps() as $app) {
- $file = \OC_App::getAppPath($app) . '/appinfo/routes.php';
- if (file_exists($file)) {
- $this->routingFiles[$app] = $file;
+ $appPath = \OC_App::getAppPath($app);
+ if($appPath !== false) {
+ $file = $appPath . '/appinfo/routes.php';
+ if (file_exists($file)) {
+ $this->routingFiles[$app] = $file;
+ }
}
}
}