[Pkg-owncloud-commits] [owncloud] 11/123: Avoid the log entry with the ModuleAlreadyExists exception when enabling the app

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 49f94b17f7f3b2918e5a7377380e2bcce05c02e5
Author: Joas Schilling <nickvergessen at owncloud.com>
Date:   Thu May 7 11:00:55 2015 +0200

    Avoid the log entry with the ModuleAlreadyExists exception when enabling the app
---
 lib/private/app.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/private/app.php b/lib/private/app.php
index aec67e6..a4dd513 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -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();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git