makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
* 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
This commit is contained in:
Joas Schilling 2014-05-28 00:07:45 +02:00
commit 317ce7b0c7
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/phpbb/version_helper.php
View file

@ -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
}

10
tests/version/version_test.php
View file

@ -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,
),
);
}