aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2018-05-03 08:22:03 +0200
committerRoeland Jago Douma <roeland@famdouma.nl>2018-05-03 08:22:03 +0200
commitf7b518fdbf70770e29a00a3b0430de97b927ee6a (patch)
tree04b107bdb7611c1f36a05bc38a7d585d9d64b16c /lib
parent2aa108000cd5bb29b7be5d7226185b5c1be59e29 (diff)
downloadnextcloud-server-f7b518fdbf70770e29a00a3b0430de97b927ee6a.tar.gz
nextcloud-server-f7b518fdbf70770e29a00a3b0430de97b927ee6a.zip
Get correct version of an app
Related to #8929 We should get the version of the app. Not of the appfolder. Else there is no way to properly compare the versions. Now note that installing in 1 go will still fail. But at least on the next page load the new version will be properly detected. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/legacy/app.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
index 7931eecc502..70f1b16e3c6 100644
--- a/lib/private/legacy/app.php
+++ b/lib/private/legacy/app.php
@@ -464,7 +464,7 @@ class OC_App {
} else {
$versionToLoad = [];
foreach ($possibleApps as $possibleApp) {
- $version = self::getAppVersionByPath($possibleApp['path']);
+ $version = self::getAppVersionByPath($possibleApp['path'] . '/' . $appId);
if (empty($versionToLoad) || version_compare($version, $versionToLoad['version'], '>')) {
$versionToLoad = array(
'dir' => $possibleApp,