From b262c30fa9780290ecd0411cee2c4da5c24066b2 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 24 Mar 2015 12:56:42 +0100
Subject: [PATCH] Correctly get array of groups and send OCP\IGroup objects to
 enable method

---
 lib/private/app.php | 10 +++++++++-
 settings/js/apps.js |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/private/app.php b/lib/private/app.php
index 1b00415417..dce159d574 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -269,7 +269,15 @@ class OC_App {
 
 		$appManager = \OC::$server->getAppManager();
 		if (!is_null($groups)) {
-			$appManager->enableAppForGroups($app, $groups);
+			$groupManager = \OC::$server->getGroupManager();
+			$groupsList = [];
+			foreach ($groups as $group) {
+				$groupItem = $groupManager->get($group);
+				if ($groupItem instanceof \OCP\IGroup) {
+					$groupsList[] = $groupManager->get($group);
+				}
+			}
+			$appManager->enableAppForGroups($app, $groupsList);
 		} else {
 			$appManager->enableApp($app);
 		}
diff --git a/settings/js/apps.js b/settings/js/apps.js
index bb52aa3a15..86400f7cba 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -406,7 +406,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 			var element = $(this).parent().find('input.enable');
 			var groups = $(this).val();
 			if (groups && groups !== '') {
-				groups = groups.split(',');
+				groups = groups.split('|');
 			} else {
 				groups = [];
 			}