improve check for duplicate apps

diff --git a/lib/private/app.php b/lib/private/app.php
index 4343ab0d1b448f7512258bc135306a28d51fe4e1..bfb4bfc6eecca38522d059e792df135726755d7b 100644 (file)
--- 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]);
                                        }
                                }