Merge pull request #23550 from owncloud/backport-23542

[stable9] getAppPath can return false
This commit is contained in:
Thomas Müller 2016-03-24 22:44:31 +01:00
commit 03f461591e
1 changed files with 6 additions and 3 deletions

View File

@ -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;
}
}
}
}