diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-01-14 12:48:59 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-01-14 13:02:02 +0100 |
| commit | 4b3a3dc0bb970c4de8ef1c4ea04f0d6f0aab8a2a (patch) | |
| tree | 93d9662d5fb9ed6cea97198f01806eaf6f5c8a1b /lib/private/app.php | |
| parent | 9b7421972b492b287999e8644c78cb98f1d03935 (diff) | |
| download | nextcloud-server-4b3a3dc0bb970c4de8ef1c4ea04f0d6f0aab8a2a.tar.gz nextcloud-server-4b3a3dc0bb970c4de8ef1c4ea04f0d6f0aab8a2a.zip | |
Check new and old ways of required oC version for app compatibility
Diffstat (limited to 'lib/private/app.php')
| -rw-r--r-- | lib/private/app.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/private/app.php b/lib/private/app.php index ecdc8ca8320..34226260689 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -1022,13 +1022,17 @@ class OC_App { public static function isAppCompatible($ocVersion, $appInfo){ $requireMin = ''; $requireMax = ''; - if (isset($appInfo['requiremin'])) { + if (isset($appInfo['dependencies']['owncloud']['@attributes']['min-version'])) { + $requireMin = $appInfo['dependencies']['owncloud']['@attributes']['min-version']; + } else if (isset($appInfo['requiremin'])) { $requireMin = $appInfo['requiremin']; } else if (isset($appInfo['require'])) { $requireMin = $appInfo['require']; } - if (isset($appInfo['requiremax'])) { + if (isset($appInfo['dependencies']['owncloud']['@attributes']['max-version'])) { + $requireMax = $appInfo['dependencies']['owncloud']['@attributes']['max-version']; + } else if (isset($appInfo['requiremax'])) { $requireMax = $appInfo['requiremax']; } |