[Pkg-owncloud-commits] [owncloud] 02/59: improve check for duplicate apps

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 9ebb037fc2b72475ca634e27a3d81a6f300da445
Author: Georg Ehrke <developer at georgehrke.com>
Date:   Thu Jul 10 17:18:10 2014 +0200

    improve check for duplicate apps
---
 lib/private/app.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/private/app.php b/lib/private/app.php
index 81e74a5..7bf04f1 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]);
 					}
 				}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git