diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-05-20 11:55:33 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-05-20 11:55:33 -0500 |
| commit | 421452e6fb0b1ebf6695775f370c2ede9ac81406 (patch) | |
| tree | 452bc5e3802a3ab59e710eca732c52af2263ef08 /phpBB/includes | |
| parent | f26257dc51c9be2ff26b2702d26cbeb96e3ceb5a (diff) | |
| parent | 4a935608708c28f2996c732517d877bb0cd80738 (diff) | |
| download | forums-421452e6fb0b1ebf6695775f370c2ede9ac81406.tar forums-421452e6fb0b1ebf6695775f370c2ede9ac81406.tar.gz forums-421452e6fb0b1ebf6695775f370c2ede9ac81406.tar.bz2 forums-421452e6fb0b1ebf6695775f370c2ede9ac81406.tar.xz forums-421452e6fb0b1ebf6695775f370c2ede9ac81406.zip | |
Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop
# 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
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_update.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_admin.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_update.php b/phpBB/includes/acp/acp_update.php index f7f003781d..6b5407067d 100644 --- a/phpBB/includes/acp/acp_update.php +++ b/phpBB/includes/acp/acp_update.php @@ -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); } diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index d9e445cff9..72855af5f8 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -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) |