Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
die_coolen_jungs
our_own_cloud_project
Commits
49f94b17
Commit
49f94b17
authored
May 07, 2015
by
Joas Schilling
Browse files
Avoid the log entry with the ModuleAlreadyExists exception when enabling the app
parent
12b24ee5
Changes
1
Hide whitespace changes
Inline
Side-by-side
lib/private/app.php
View file @
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
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment