summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-03-24 22:44:31 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-03-24 22:44:31 +0100
commit03f461591e5d20c7d0e25df7c997b855f1e797e4 (patch)
tree5220077a3c0ad494477dc685f382df82e94bce77 /lib
parentaf7c34d9a626f76a94ecfa6e5b73a786aeeebe11 (diff)
parent0bb7644150a4b9666a066b5c9aaa06adde74cc4e (diff)
downloadnextcloud-server-03f461591e5d20c7d0e25df7c997b855f1e797e4.tar.gz
nextcloud-server-03f461591e5d20c7d0e25df7c997b855f1e797e4.zip
Merge pull request #23550 from owncloud/backport-23542
[stable9] 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 13f7a7a1cfb..e1690ed7b35 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;
+ }
}
}
}