Commit 16a0de63 authored by Lukas Reschke's avatar Lukas Reschke
Browse files

Merge pull request #16146 from owncloud/issue-16103-hide-module-already-exists-on-enable-app

Avoid the log entry with the ModuleAlreadyExists exception when enabl…
parents ebf39539 49f94b17
......@@ -385,7 +385,13 @@ class OC_App {
public static function getAppNavigationEntries($app) {
if (is_file(self::getAppPath($app) . '/appinfo/app.php')) {
OC::$server->getNavigationManager()->clear();
require $app . '/appinfo/app.php';
try {
require $app . '/appinfo/app.php';
} catch (\OC\Encryption\Exceptions\ModuleAlreadyExistsException $e) {
// FIXME we should avoid getting this exception in first place,
// For now we just catch it, since we don't care about encryption modules
// when trying to find out, whether the app has a navigation entry.
}
return OC::$server->getNavigationManager()->getAll();
}
return array();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment