diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-02-21 13:28:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-21 13:28:10 +0100 |
| commit | 8b44c16ddc8f6b73aaa61d205be956024e6de195 (patch) | |
| tree | 152985c109c9ee9121fbc48fb8d356476b3127e6 /lib | |
| parent | 7c6cc013ebec7bbdecbf9f5567d620fcfbb37212 (diff) | |
| parent | 4a41e0cc42181aefa7ee860da3945faefda3c691 (diff) | |
| download | nextcloud-server-8b44c16ddc8f6b73aaa61d205be956024e6de195.tar.gz nextcloud-server-8b44c16ddc8f6b73aaa61d205be956024e6de195.zip | |
Merge pull request #8471 from nextcloud/fix_upgrade
getIncompatibleApps needs a string not an array
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 1 | ||||
| -rw-r--r-- | lib/private/App/AppManager.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php index 05da2814d4c..c5eabe1910a 100644 --- a/lib/base.php +++ b/lib/base.php @@ -373,6 +373,7 @@ class OC { // get third party apps $ocVersion = \OCP\Util::getVersion(); + $ocVersion = implode('.', $ocVersion); $incompatibleApps = $appManager->getIncompatibleApps($ocVersion); $incompatibleShippedApps = []; foreach ($incompatibleApps as $appInfo) { diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php index 690dcfe5639..4bf15c23fab 100644 --- a/lib/private/App/AppManager.php +++ b/lib/private/App/AppManager.php @@ -397,7 +397,7 @@ class AppManager implements IAppManager { * * @internal */ - public function getIncompatibleApps($version) { + public function getIncompatibleApps(string $version): array { $apps = $this->getInstalledApps(); $incompatibleApps = array(); foreach ($apps as $appId) { |