diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-10-14 02:49:15 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-10-14 02:49:15 +0200 |
| commit | c5ee92c3f2de26396b0212103eabce46afba53b7 (patch) | |
| tree | a4adbfd0ffb1977e725ccae0eaa6a9640903a6a6 /phpBB/includes/acp/acp_update.php | |
| parent | 52b2ee5a0619ba03ffa267850c6a1d55ad276042 (diff) | |
| parent | dda1e13126ae81aff19114e168f134a6077ed549 (diff) | |
| download | forums-c5ee92c3f2de26396b0212103eabce46afba53b7.tar forums-c5ee92c3f2de26396b0212103eabce46afba53b7.tar.gz forums-c5ee92c3f2de26396b0212103eabce46afba53b7.tar.bz2 forums-c5ee92c3f2de26396b0212103eabce46afba53b7.tar.xz forums-c5ee92c3f2de26396b0212103eabce46afba53b7.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.
[ticket/10278] Also timeout when receiving data over a slow connection.
[ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds.
[ticket/10278] Return with a timeout error when fread() or fgets() time out.
[ticket/10278] Also set timeout on stream in get_remote_file().
Diffstat (limited to 'phpBB/includes/acp/acp_update.php')
| -rw-r--r-- | phpBB/includes/acp/acp_update.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_update.php b/phpBB/includes/acp/acp_update.php index f0365e8e66..ee4e49249d 100644 --- a/phpBB/includes/acp/acp_update.php +++ b/phpBB/includes/acp/acp_update.php @@ -37,7 +37,7 @@ class acp_update $errstr = ''; $errno = 0; - $info = obtain_latest_version_info(request_var('versioncheck_force', false), true); + $info = obtain_latest_version_info(request_var('versioncheck_force', false)); if ($info === false) { |