makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-29 14:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11551] Fix error in system tab if get_remote_file returns empty string

Browse source 
Currently a debug error is thrown. With this patch, it fails without keeping
the admin from being able to access the rest of the System modules by showing
a nicer error "Failed to obtain latest version information."

PHPBB3-11551
This commit is contained in:
David King 2013-05-20 12:20:55 -04:00
parent 4fc180ade5
commit 901955e452
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/acp/acp_update.php
View file

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

2
phpBB/includes/functions_admin.php
View file

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