diff options
| -rw-r--r-- | lib/private/app.php | 11 | ||||
| -rw-r--r-- | lib/private/app/appmanager.php | 3 | ||||
| -rw-r--r-- | lib/private/installer.php | 9 | ||||
| -rw-r--r-- | lib/public/app.php | 2 | ||||
| -rw-r--r-- | tests/data/testapp.zip | bin | 895 -> 689 bytes | |||
| -rw-r--r-- | tests/data/testapp2.zip | bin | 2449 -> 2240 bytes |
6 files changed, 6 insertions, 19 deletions
diff --git a/lib/private/app.php b/lib/private/app.php index 2abc015a91f..3df3a0e5bac 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -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'] : ''; } diff --git a/lib/private/app/appmanager.php b/lib/private/app/appmanager.php index eeb2216d5a8..4855f6f0185 100644 --- a/lib/private/app/appmanager.php +++ b/lib/private/app/appmanager.php @@ -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 diff --git a/lib/private/installer.php b/lib/private/installer.php index f30db9ca659..1e4bb968929 100644 --- a/lib/private/installer.php +++ b/lib/private/installer.php @@ -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; diff --git a/lib/public/app.php b/lib/public/app.php index e25f025d12d..032116eb43f 100644 --- a/lib/public/app.php +++ b/lib/public/app.php @@ -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 diff --git a/tests/data/testapp.zip b/tests/data/testapp.zip Binary files differindex e76c0d18724..c828572827f 100644 --- a/tests/data/testapp.zip +++ b/tests/data/testapp.zip diff --git a/tests/data/testapp2.zip b/tests/data/testapp2.zip Binary files differindex f46832f7a75..1953cc896f8 100644 --- a/tests/data/testapp2.zip +++ b/tests/data/testapp2.zip |