diff options
author | Vincent Petry <pvince81@owncloud.com> | 2013-11-18 05:48:17 -0800 |
---|---|---|
committer | Vincent Petry <pvince81@owncloud.com> | 2013-11-18 05:48:17 -0800 |
commit | 44c2f9aad2b475303b3bebb39f38954cb3210751 (patch) | |
tree | 0df9b438d3295253b9d74b90d1befd92e311f30d /lib | |
parent | d306f5c4cf1cc9ed2bcccdeaa624268da6137e91 (diff) | |
parent | 385a296864b9993988c3750ed0939de6481458a7 (diff) | |
download | nextcloud-server-44c2f9aad2b475303b3bebb39f38954cb3210751.tar.gz nextcloud-server-44c2f9aad2b475303b3bebb39f38954cb3210751.zip |
Merge pull request #5915 from owncloud/fix_apps_versioncheck
Fix apps versioncheck
Diffstat (limited to 'lib')
-rw-r--r-- | lib/private/installer.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/private/installer.php b/lib/private/installer.php index d7b207c6aad..9b49543c3fb 100644 --- a/lib/private/installer.php +++ b/lib/private/installer.php @@ -147,7 +147,14 @@ class OC_Installer{ } // check if the ocs version is the same as the version in info.xml/version - if(!isset($info['version']) or ($info['version']<>$data['appdata']['version'])) { + $versionFile= $extractDir.'/appinfo/version'; + if(is_file($versionFile)) { + $version = trim(file_get_contents($versionFile)); + }else{ + $version = trim($info['version']); + } + + if($version<>trim($data['appdata']['version'])) { OC_Helper::rmdirr($extractDir); throw new \Exception($l->t("App can't be installed because the version in info.xml/version is not the same as the version reported from the app store")); } |