summaryrefslogtreecommitdiffstats
path: root/lib/private/app.php
diff options
context:
space:
mode:
authorGeorg Ehrke <developer@georgehrke.com>2014-07-10 17:18:10 +0200
committerGeorg Ehrke <developer@georgehrke.com>2014-07-10 17:18:10 +0200
commitfb685b08565746ca2646280e21f904fe69eb15f9 (patch)
tree9ed51341cb77d40b017362732709ccb3a9f1c0b4 /lib/private/app.php
parent305db9c2d7970510821fba1b7f39150132ebd46f (diff)
downloadnextcloud-server-fb685b08565746ca2646280e21f904fe69eb15f9.tar.gz
nextcloud-server-fb685b08565746ca2646280e21f904fe69eb15f9.zip
improve check for duplicate apps
Diffstat (limited to 'lib/private/app.php')
-rw-r--r--lib/private/app.php9
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/private/app.php b/lib/private/app.php
index 4343ab0d1b4..bfb4bfc6eec 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -826,13 +826,8 @@ class OC_App {
// Remove duplicates
foreach ($appList as $app) {
foreach ($remoteApps AS $key => $remote) {
- if (
- $app['name'] == $remote['name']
- // To set duplicate detection to use OCS ID instead of string name,
- // enable this code, remove the line of code above,
- // and add <ocs_id>[ID]</ocs_id> to info.xml of each 3rd party app:
- // OR $app['ocs_id'] == $remote['ocs_id']
- ) {
+ if ($app['name'] === $remote['name'] ||
+ $app['ocsid'] === $remote['id']) {
unset($remoteApps[$key]);
}
}