[Pkg-owncloud-commits] [owncloud] 67/111: fix the version check for downloaded apps. Fixes https://github.com/owncloud/apps/issues/1485

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit e5994f9c1ac93fec60b6798abf2f98c102370847
Author: Frank Karlitschek <frank at owncloud.org>
Date:   Mon Nov 18 12:16:03 2013 +0100

    fix the version check for downloaded apps. Fixes https://github.com/owncloud/apps/issues/1485
---
 lib/private/installer.php |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/private/installer.php b/lib/private/installer.php
index d7b207c..91a1df7 100644
--- a/lib/private/installer.php
+++ b/lib/private/installer.php
@@ -147,11 +147,18 @@ 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"));
 		}
-
+		
 		$basedir=OC_App::getInstallPath().'/'.$info['id'];
 		//check if the destination directory already exists
 		if(is_dir($basedir)) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git