Merge pull request #22829 from owncloud/stable9-revert-22264-read-version-from-info.xml-only

[stable9] Revert "No longer evaluate appinfo/version"

lib/private/app.php

@@ -567,7 +567,7 @@ class OC_App {
 	}
 
 	/**
-	 * get the last version of the app from appinfo/info.xml
+	 * get the last version of the app, either from appinfo/version or from appinfo/info.xml
 	 *
 	 * @param string $appId
 	 * @return string
@@ -587,10 +587,15 @@ class OC_App {
 	 * @return string
 	 */
 	public static function getAppVersionByPath($path) {
+		$versionFile = $path . '/appinfo/version';
 		$infoFile = $path . '/appinfo/info.xml';
+		if (is_file($versionFile)) {
+			return trim(file_get_contents($versionFile));
+		} else {
 			$appData = self::getAppInfo($infoFile, true);
 			return isset($appData['version']) ? $appData['version'] : '';
 		}
+	}
 
 
 	/**

lib/private/app/appmanager.php

@@ -299,6 +299,9 @@ class AppManager implements IAppManager {
 	/**
 	 * Returns the app information from "appinfo/info.xml".
 	 *
+	 * If no version was present in "appinfo/info.xml", reads it
+	 * from the external "appinfo/version" file instead.
+	 *
 	 * @param string $appId app id
 	 *
 	 * @return array app iinfo

lib/private/installer.php

@@ -389,11 +389,16 @@ class OC_Installer{
 		}
 
 		// check if the ocs version is the same as the version in info.xml/version
+		$versionFile= $extractDir.'/appinfo/version';
+		if(is_file($versionFile)) {
+			$version = trim(file_get_contents($versionFile));
+		}else{
 			$version = trim($info['version']);
+		}
 
 		if(isset($data['appdata']['version']) && $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 is not the same as the version reported from the app store"));
+			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"));
 		}
 
 		return $info;

lib/public/app.php

@@ -142,7 +142,7 @@ class App {
 	}
 
 	/**
-	 * Get the last version of the app from appinfo/info.xml
+	 * Get the last version of the app, either from appinfo/version or from appinfo/info.xml
 	 * @param string $app
 	 * @return string
 	 * @since 4.0.0