From 305db9c2d7970510821fba1b7f39150132ebd46f Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 10 Jul 2014 17:17:55 +0200 Subject: [PATCH 1/2] add proper version comparision in OC_Installer::isUpdateAvailable --- lib/private/installer.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/private/installer.php b/lib/private/installer.php index 29470dbe3a6..f9d0b36afb4 100644 --- a/lib/private/installer.php +++ b/lib/private/installer.php @@ -377,9 +377,8 @@ class OC_Installer{ $ocsdata=OC_OCSClient::getApplication($ocsid); $ocsversion= (string) $ocsdata['version']; $currentversion=OC_App::getAppVersion($app); - if($ocsversion<>$currentversion) { + if (version_compare($ocsversion, $currentversion, '>')) { return($ocsversion); - }else{ return false; } From fb685b08565746ca2646280e21f904fe69eb15f9 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 10 Jul 2014 17:18:10 +0200 Subject: [PATCH 2/2] 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 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 [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]); } }