diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-10-14 02:47:45 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-10-14 02:47:45 +0200 |
| commit | dda1e13126ae81aff19114e168f134a6077ed549 (patch) | |
| tree | 7684312c2fdf48de10ab5ac6e43576430e620e01 /phpBB/includes/acp/acp_update.php | |
| parent | 4e69fe68590cca0db66cc90af12e74c58bac10be (diff) | |
| parent | 1dc1583b92daa666193d766e3728ce9723f4d20f (diff) | |
| download | forums-dda1e13126ae81aff19114e168f134a6077ed549.tar forums-dda1e13126ae81aff19114e168f134a6077ed549.tar.gz forums-dda1e13126ae81aff19114e168f134a6077ed549.tar.bz2 forums-dda1e13126ae81aff19114e168f134a6077ed549.tar.xz forums-dda1e13126ae81aff19114e168f134a6077ed549.zip | |
Merge remote-tracking branch 'github-bantu/ticket/10278' into develop-olympus
* github-bantu/ticket/10278:
[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 931fa53165..7e3d1a1024 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) { |