Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Ehrke <developer@georgehrke.com>2014-07-10 19:18:10 +0400
committerVincent Petry <pvince81@owncloud.com>2014-07-14 12:00:38 +0400
commit9ebb037fc2b72475ca634e27a3d81a6f300da445 (patch)
treef756efacd05376f611327afed693dc50f5d9244e /lib/private/app.php
parent5bb42bedec3dd4b55c266fb3405463a0092ebcda (diff)
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 81e74a51675..7bf04f11267 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -831,13 +831,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]);
}
}