aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install
diff options
context:
space:
mode:
authorNathaniel Guse <nathaniel.guse@gmail.com>2013-06-06 12:56:36 -0500
committerNathaniel Guse <nathaniel.guse@gmail.com>2013-06-06 12:56:36 -0500
commitf4247aa3fed4b49742b6c2efed704d612890a45e (patch)
tree6f67d513a303f5daf3cf657bdf6febcccca77211 /phpBB/install
parent3931f7f3b9b4581c67b4e958f6cc9c2e13daccd5 (diff)
parentdeaa263e0a0c2f2a42dde3d81fe7fc4b36dabd21 (diff)
downloadforums-f4247aa3fed4b49742b6c2efed704d612890a45e.tar
forums-f4247aa3fed4b49742b6c2efed704d612890a45e.tar.gz
forums-f4247aa3fed4b49742b6c2efed704d612890a45e.tar.bz2
forums-f4247aa3fed4b49742b6c2efed704d612890a45e.tar.xz
forums-f4247aa3fed4b49742b6c2efed704d612890a45e.zip
Merge branch 'develop-olympus' into develop
# By Andreas Fischer # Via Andreas Fischer (1) and Nathaniel Guse (1) * develop-olympus: [ticket/11588] Also use version.phpbb.com in install_update.php.
Diffstat (limited to 'phpBB/install')
-rw-r--r--phpBB/install/install_update.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index aa1bd0fa35..df9b6c1c7e 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -1618,7 +1618,9 @@ class install_update extends module
{
case 'version_info':
global $phpbb_root_path, $phpEx;
- $info = get_remote_file('www.phpbb.com', '/updatecheck', ((defined('PHPBB_QA')) ? '30x_qa.txt' : '30x.txt'), $errstr, $errno);
+
+ $info = get_remote_file('version.phpbb.com', '/phpbb',
+ ((defined('PHPBB_QA')) ? '30x_qa.txt' : '30x.txt'), $errstr, $errno);
if ($info !== false)
{