@@ -564,7 +564,7 @@ class OC_App { | |||
} | |||
/** | |||
* get the last version of the app, either from appinfo/version or from appinfo/info.xml | |||
* get the last version of the app from appinfo/info.xml | |||
* | |||
* @param string $appId | |||
* @return string | |||
@@ -584,14 +584,9 @@ 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'] : ''; | |||
} | |||
$appData = self::getAppInfo($infoFile, true); | |||
return isset($appData['version']) ? $appData['version'] : ''; | |||
} | |||
@@ -297,9 +297,6 @@ 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 |
@@ -390,16 +390,11 @@ 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']); | |||
} | |||
$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/version 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 is not the same as the version reported from the app store")); | |||
} | |||
return $info; |
@@ -142,7 +142,7 @@ class App { | |||
} | |||
/** | |||
* Get the last version of the app, either from appinfo/version or from appinfo/info.xml | |||
* Get the last version of the app from appinfo/info.xml | |||
* @param string $app | |||
* @return string | |||
* @since 4.0.0 |