diff options
| author | Yuriy Rusko <github@rusko.net> | 2014-05-28 01:02:39 +0200 |
|---|---|---|
| committer | Yuriy Rusko <github@rusko.net> | 2014-05-28 01:02:39 +0200 |
| commit | 2a42aee8acfcab79b0dd43572b9da2c4dd8a288a (patch) | |
| tree | 50400df541c6ac30ecf894830012b7a7c28b45fc /phpBB/phpbb/version_helper.php | |
| parent | 1d61bcedfd1882f84d102c523a354a8c4ae69336 (diff) | |
| parent | 08c01b7cee629701dc62b32b03eb5543e8c9d196 (diff) | |
| download | forums-2a42aee8acfcab79b0dd43572b9da2c4dd8a288a.tar forums-2a42aee8acfcab79b0dd43572b9da2c4dd8a288a.tar.gz forums-2a42aee8acfcab79b0dd43572b9da2c4dd8a288a.tar.bz2 forums-2a42aee8acfcab79b0dd43572b9da2c4dd8a288a.tar.xz forums-2a42aee8acfcab79b0dd43572b9da2c4dd8a288a.zip | |
Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594
Diffstat (limited to 'phpBB/phpbb/version_helper.php')
| -rw-r--r-- | phpBB/phpbb/version_helper.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/phpbb/version_helper.php b/phpBB/phpbb/version_helper.php index 47e9bbe0f3..5991744e76 100644 --- a/phpBB/phpbb/version_helper.php +++ b/phpBB/phpbb/version_helper.php @@ -251,7 +251,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'); @@ -267,6 +267,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 } |