mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-07 01:06:48 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'EXreaction/ticket/9871-2' into develop

Browse Source 
* EXreaction/ticket/9871-2:
  [ticket/9871] Can set current version to use instead of the phpBB version
  [ticket/9871] Fix indentation on comment
  [ticket/9871] Fix test name
  [ticket/9871] Split fast and slow version tests
  [ticket/9871] Option to force the stability when checking for updates
  [ticket/9871] Allow setting the host/file to load for the version class
  [ticket/9871] Restore get_remote_file_test
  [ticket/9871] Fix tests
  [ticket/9871] Typehint and comment on var types
  [ticket/9871] Mark test as slow
  [ticket/9871] Restore phpbb_version_compare
  [ticket/9871] Restore get_remote_file
  [ticket/9871] Use $request->variable instead of request_var
  [ticket/9871] Update version check file to use json format
This commit is contained in:
Joas Schilling
2014-03-14 14:04:30 +01:00
parent c743e28b94 60d2c1f400
commit 0aa23d203e
11 changed files with 737 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
phpBB/install/install_update.php
View File

@@ -154,14 +154,23 @@ class install_update extends module
));
// Get current and latest version
if (($latest_version = $cache->get('_version_info')) === false)
$version_helper = $phpbb_container->get('version_helper');
try
{
$this->latest_version = $this->get_file('version_info');
$cache->put('_version_info', $this->latest_version);
$this->latest_version = $version_helper->get_latest_on_current_branch(true);
}
else
catch (\RuntimeException $e)
{
$this->latest_version = $latest_version;
$this->latest_version = false;
$update_info = array();
include($phpbb_root_path . 'install/update/index.' . $phpEx);
$info = (empty($update_info) || !is_array($update_info)) ? false : $update_info;
if ($info !== false)
{
$this->latest_version = (!empty($info['version']['to'])) ? trim($info['version']['to']) : false;
}
}
// For the current version we trick a bit. ;)
@@ -1606,37 +1615,6 @@ class install_update extends module
switch ($mode)
{
case 'version_info':
global $phpbb_root_path, $phpEx;
$info = get_remote_file('version.phpbb.com', '/phpbb',
((defined('PHPBB_QA')) ? '30x_qa.txt' : '30x.txt'), $errstr, $errno);
if ($info !== false)
{
$info = explode("\n", $info);
$info = trim($info[0]);
}
if ($this->test_update !== false)
{
$info = $this->test_update;
}
// If info is false the fsockopen function may not be working. Instead get the latest version from our update file (and pray it is up-to-date)
if ($info === false)
{
$update_info = array();
include($phpbb_root_path . 'install/update/index.' . $phpEx);
$info = (empty($update_info) || !is_array($update_info)) ? false : $update_info;
if ($info !== false)
{
$info = (!empty($info['version']['to'])) ? trim($info['version']['to']) : false;
}
}
break;
case 'update_info':
global $phpbb_root_path, $phpEx;