diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-28 00:07:45 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-28 00:07:45 +0200 |
| commit | 317ce7b0c7d929fe4b51dce0441ff2752adc0976 (patch) | |
| tree | 228918bd089612383ba1949078cd024213c52dd2 | |
| parent | 9d41bca27d653a2e9e89b136bcf26543687a08e0 (diff) | |
| parent | 83fc8725daf163398300ff6ddc6256b9444b39cd (diff) | |
| download | forums-317ce7b0c7d929fe4b51dce0441ff2752adc0976.tar forums-317ce7b0c7d929fe4b51dce0441ff2752adc0976.tar.gz forums-317ce7b0c7d929fe4b51dce0441ff2752adc0976.tar.bz2 forums-317ce7b0c7d929fe4b51dce0441ff2752adc0976.tar.xz forums-317ce7b0c7d929fe4b51dce0441ff2752adc0976.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12536] Restore missing @throws
[ticket/12536] Add test cases with empty versions list
[ticket/12536] Use stable values when unstable are unavailable
[ticket/12536] Update doc block
[ticket/12536] Return empty array if stability unavailable
[ticket/12536] Get Versions Should Not Require Both Stable and Unstable
| -rw-r--r-- | phpBB/phpbb/version_helper.php | 5 | ||||
| -rw-r--r-- | tests/version/version_test.php | 10 |
2 files changed, 14 insertions, 1 deletions
diff --git a/phpBB/phpbb/version_helper.php b/phpBB/phpbb/version_helper.php index e2fdf6ce63..76bd477e18 100644 --- a/phpBB/phpbb/version_helper.php +++ b/phpBB/phpbb/version_helper.php @@ -247,7 +247,7 @@ class version_helper $info = json_decode($info, true); - if (empty($info['stable']) || empty($info['unstable'])) + if (empty($info['stable']) && empty($info['unstable'])) { $this->user->add_lang('acp/common'); @@ -263,6 +263,9 @@ class version_helper } } + $info['stable'] = (empty($info['stable'])) ? array() : $info['stable']; + $info['unstable'] = (empty($info['unstable'])) ? $info['stable'] : $info['unstable']; + $this->cache->put($cache_file, $info, 86400); // 24 hours } diff --git a/tests/version/version_test.php b/tests/version/version_test.php index 2e2398bd45..5caad46e10 100644 --- a/tests/version/version_test.php +++ b/tests/version/version_test.php @@ -181,6 +181,11 @@ class phpbb_version_helper_test extends phpbb_test_case ), ), ), + array( + '1.1.0', + array(), + array(), + ), ); } @@ -286,6 +291,11 @@ class phpbb_version_helper_test extends phpbb_test_case ), '1.1.0-a2', ), + array( + '1.1.0', + array(), + null, + ), ); } |