diff options
author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-02-26 12:37:11 +0400 |
---|---|---|
committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-02-26 12:37:11 +0400 |
commit | 5b250afafc9e32e64458bb9237e4f895a0be3e4a (patch) | |
tree | 6a9fe102e04f5f7d1f1265876fade0a4e2f88a32 | |
parent | 072daf8850c87b070c3dad921c16246d095d9cb2 (diff) | |
parent | f415f3e03e733e6110827d28470aae51bdaea844 (diff) |
Merge pull request #1903 from owncloud/fix_version_check
return true once one owncloud version number is bigger at any position
-rw-r--r-- | lib/app.php | 2 | ||||
-rw-r--r-- | tests/lib/app.php | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/lib/app.php b/lib/app.php index 2eb43a582e2..55b4543ec9f 100644 --- a/lib/app.php +++ b/lib/app.php @@ -885,6 +885,8 @@ class OC_App{ if($owncloudVersion < $appVersion){ return false; + } elseif ($owncloudVersion > $appVersion) { + return true; } } diff --git a/tests/lib/app.php b/tests/lib/app.php index 9cab36903a2..c452d752c9f 100644 --- a/tests/lib/app.php +++ b/tests/lib/app.php @@ -40,6 +40,14 @@ class Test_App extends PHPUnit_Framework_TestCase { $this->assertTrue(OC_App::isAppVersionCompatible($oc, $app)); } + + public function testIsAppVersionCompatibleComplex(){ + $oc = array(5, 0, 0); + $app = '4.5.1'; + + $this->assertTrue(OC_App::isAppVersionCompatible($oc, $app)); + } + public function testIsAppVersionCompatibleShouldFail(){ $oc = array(4, 3, 1); |