wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid the log entry with the ModuleAlreadyExists exception when enabling the app

Browse source
This commit is contained in:
Joas Schilling 2015-05-07 11:00:55 +02:00
parent 12b24ee567
commit 49f94b17f7
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/private/app.php
View file

@ -385,7 +385,13 @@ class OC_App {
public static function getAppNavigationEntries($app) { public static function getAppNavigationEntries($app) {
if (is_file(self::getAppPath($app) . '/appinfo/app.php')) { if (is_file(self::getAppPath($app) . '/appinfo/app.php')) {
OC::$server->getNavigationManager()->clear(); 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 OC::$server->getNavigationManager()->getAll();
} }
return array(); return array();