mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-05 22:14:59 +02:00
Merge remote-tracking branch 'remotes/imkingdavid/ticket/11551' into develop-olympus
# By David King # Via David King * remotes/imkingdavid/ticket/11551: [ticket/11551] Fix error in system tab if get_remote_file returns empty string
This commit is contained in:
commit
4a93560870
@ -39,7 +39,7 @@ class acp_update
|
|||||||
|
|
||||||
$info = obtain_latest_version_info(request_var('versioncheck_force', false));
|
$info = obtain_latest_version_info(request_var('versioncheck_force', false));
|
||||||
|
|
||||||
if ($info === false)
|
if (empty($info))
|
||||||
{
|
{
|
||||||
trigger_error('VERSIONCHECK_FAIL', E_USER_WARNING);
|
trigger_error('VERSIONCHECK_FAIL', E_USER_WARNING);
|
||||||
}
|
}
|
||||||
|
@ -3319,7 +3319,7 @@ function obtain_latest_version_info($force_update = false, $warn_fail = false, $
|
|||||||
$info = get_remote_file('version.phpbb.com', '/phpbb',
|
$info = get_remote_file('version.phpbb.com', '/phpbb',
|
||||||
((defined('PHPBB_QA')) ? '30x_qa.txt' : '30x.txt'), $errstr, $errno);
|
((defined('PHPBB_QA')) ? '30x_qa.txt' : '30x.txt'), $errstr, $errno);
|
||||||
|
|
||||||
if ($info === false)
|
if (empty($info))
|
||||||
{
|
{
|
||||||
$cache->destroy('versioncheck');
|
$cache->destroy('versioncheck');
|
||||||
if ($warn_fail)
|
if ($warn_fail)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user