diff options
author | Morris Jobke <hey@morrisjobke.de> | 2016-12-05 23:26:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-05 23:26:32 +0100 |
commit | 572b078de7e139de748ea829876b4b1b04b306bb (patch) | |
tree | 6add143c45f5a994427d57452f393da4244a0eb6 /lib/private | |
parent | a89b033869db08f1ad3483a5ab3fe774e898fa0f (diff) | |
parent | 60d1e8e63e685a33697cccceb0517db8ca87644f (diff) | |
download | nextcloud-server-572b078de7e139de748ea829876b4b1b04b306bb.tar.gz nextcloud-server-572b078de7e139de748ea829876b4b1b04b306bb.zip |
Merge pull request #2520 from nextcloud/replace-string
Check for nextcloud version as well
Diffstat (limited to 'lib/private')
-rw-r--r-- | lib/private/App/CodeChecker/InfoChecker.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/private/App/CodeChecker/InfoChecker.php b/lib/private/App/CodeChecker/InfoChecker.php index 77bf7e8182d..1e617e3aeec 100644 --- a/lib/private/App/CodeChecker/InfoChecker.php +++ b/lib/private/App/CodeChecker/InfoChecker.php @@ -86,7 +86,10 @@ class InfoChecker extends BasicEmitter { 'type' => 'duplicateRequirement', 'field' => 'min', ]; - } else if (!isset($info['dependencies']['owncloud']['@attributes']['min-version'])) { + } else if ( + !isset($info['dependencies']['owncloud']['@attributes']['min-version']) && + !isset($info['dependencies']['nextcloud']['@attributes']['min-version']) + ) { $this->emit('InfoChecker', 'missingRequirement', ['min']); } @@ -96,7 +99,10 @@ class InfoChecker extends BasicEmitter { 'type' => 'duplicateRequirement', 'field' => 'max', ]; - } else if (!isset($info['dependencies']['owncloud']['@attributes']['max-version'])) { + } else if ( + !isset($info['dependencies']['owncloud']['@attributes']['max-version']) && + !isset($info['dependencies']['nextcloud']['@attributes']['max-version']) + ) { $this->emit('InfoChecker', 'missingRequirement', ['max']); } |