summaryrefslogtreecommitdiffstats
path: root/lib/private/app/appmanager.php
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2015-08-20 11:14:30 +0200
committerVincent Petry <pvince81@owncloud.com>2015-08-20 11:14:30 +0200
commita2674b2b303c6b2a5935638af04f0e4a61afae24 (patch)
tree3d067ca9f3a187b99a9f5184586a8dd8653e043b /lib/private/app/appmanager.php
parentb919ae96f093a927e83f9f114a34400a4095ea5e (diff)
downloadnextcloud-server-a2674b2b303c6b2a5935638af04f0e4a61afae24.tar.gz
nextcloud-server-a2674b2b303c6b2a5935638af04f0e4a61afae24.zip
Additions to update page
Apps to update and to disable will always be shown. Main title changes only when apps need updated, not core. Added bullet style. Exclude incompatible apps from updated apps list.
Diffstat (limited to 'lib/private/app/appmanager.php')
-rw-r--r--lib/private/app/appmanager.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/private/app/appmanager.php b/lib/private/app/appmanager.php
index 86674aa047c..75b1c0a7865 100644
--- a/lib/private/app/appmanager.php
+++ b/lib/private/app/appmanager.php
@@ -213,11 +213,12 @@ class AppManager implements IAppManager {
/**
* Returns a list of apps that need upgrade
*
+ * @param array $version ownCloud version as array of version components
* @return array list of app info from apps that need an upgrade
*
* @internal
*/
- public function getAppsNeedingUpgrade() {
+ public function getAppsNeedingUpgrade($ocVersion) {
$appsToUpgrade = [];
$apps = $this->getInstalledApps();
foreach ($apps as $appId) {
@@ -226,6 +227,7 @@ class AppManager implements IAppManager {
if ($appDbVersion
&& isset($appInfo['version'])
&& version_compare($appInfo['version'], $appDbVersion, '>')
+ && \OC_App::isAppCompatible($ocVersion, $appInfo)
) {
$appsToUpgrade[] = $appInfo;
}
@@ -258,7 +260,7 @@ class AppManager implements IAppManager {
/**
* Returns a list of apps incompatible with the given version
*
- * @param array $version version as array of version components
+ * @param array $version ownCloud version as array of version components
*
* @return array list of app info from incompatible apps
*