summaryrefslogtreecommitdiffstats
path: root/lib/private
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-09 12:15:39 +0200
commita7948069c52011e65457d220bcf9901ece33b5f7 (patch)
tree5b6f45e28391837dcc0ff8fd72f8187a3e548906 /lib/private
parent44255faab38e003ed39c1b2e74ce68d7b509d504 (diff)
downloadnextcloud-server-a7948069c52011e65457d220bcf9901ece33b5f7.tar.gz
nextcloud-server-a7948069c52011e65457d220bcf9901ece33b5f7.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/private')
-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 eab064962bd..0154e7dbeb6 100644
--- a/lib/private/legacy/app.php
+++ b/lib/private/legacy/app.php
@@ -518,7 +518,7 @@ class OC_App {
} else {
$versionToLoad = array();
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,