Merge pull request #6784 from owncloud/fix-activation-of-unknown-apps

Fix activation of unknown apps

2 files changed, 15 insertions, 12 deletions

diff --git a/lib/private/installer.php b/lib/private/installer.php
index 8375b231e9b..835b6b4c01a 100644
--- a/lib/private/installer.php
+++ b/lib/private/installer.php
@@ -407,6 +407,9 @@ class OC_Installer{
 			include OC_App::getAppPath($app)."/appinfo/install.php";
 		}
 		$info=OC_App::getAppInfo($app);
+		if (is_null($info)) {
+			return false;
+		}
 		OC_Appconfig::setValue($app, 'installed_version', OC_App::getAppVersion($app));
 
 		//set remote/public handelers
diff --git a/tests/enable_all.php b/tests/enable_all.php
index 4f2fe5cdb60..d54418ff8e4 100644
--- a/tests/enable_all.php
+++ b/tests/enable_all.php
@@ -8,16 +8,16 @@
 
 require_once __DIR__.'/../lib/base.php';
 
-OC_App::enable('files_sharing');
-OC_App::enable('files_encryption');
-OC_App::enable('user_ldap');
-OC_App::enable('calendar');
-OC_App::enable('contacts');
-OC_App::enable('apptemplateadvanced');
-OC_App::enable('appframework');
-#OC_App::enable('files_archive');
-#OC_App::enable('mozilla_sync');
-#OC_App::enable('news');
-#OC_App::enable('provisioning_api');
-#OC_App::enable('user_external');
+function enableApp($app) {
+	try {
+		OC_App::enable($app);
+	} catch (Exception $e) {
+		echo $e;
+	}
+}
+
+enableApp('files_sharing');
+enableApp('files_encryption');
+//enableApp('files_external');
+enableApp('user_ldap');