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

Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop

Browse source 
# By David King
# Via David King (1) and Nathan Guse (1)
* remotes/upstream/develop-olympus:
  [ticket/11551] Fix error in system tab if get_remote_file returns empty string
This commit is contained in:
Nathan Guse 2013-05-20 11:55:33 -05:00
commit 421452e6fb
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

@ -38,7 +38,7 @@ class acp_update
$info = obtain_latest_version_info(request_var('versioncheck_force', false));
if ($info === false)
if (empty($info))
{
trigger_error('VERSIONCHECK_FAIL', E_USER_WARNING);
}

2
phpBB/includes/functions_admin.php
View file

@ -3088,7 +3088,7 @@ function obtain_latest_version_info($force_update = false, $warn_fail = false, $
$info = get_remote_file('version.phpbb.com', '/phpbb',
((defined('PHPBB_QA')) ? '30x_qa.txt' : '30x.txt'), $errstr, $errno);
if ($info === false)
if (empty($info))
{
$cache->destroy('versioncheck');
if ($warn_fail)