mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-28 20:40:24 +02:00
Merge remote-tracking branch 'EXreaction/ticket/9871-2' into develop
* 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:
@@ -3041,7 +3041,7 @@ function get_remote_file($host, $directory, $filename, &$errstr, &$errno, $port
|
||||
return $file_info;
|
||||
}
|
||||
|
||||
/**
|
||||
/*
|
||||
* Tidy Warnings
|
||||
* Remove all warnings which have now expired from the database
|
||||
* The duration of a warning can be defined by the administrator
|
||||
@@ -3150,45 +3150,6 @@ function add_permission_language()
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Obtains the latest version information
|
||||
*
|
||||
* @param bool $force_update Ignores cached data. Defaults to false.
|
||||
* @param bool $warn_fail Trigger a warning if obtaining the latest version information fails. Defaults to false.
|
||||
* @param int $ttl Cache version information for $ttl seconds. Defaults to 86400 (24 hours).
|
||||
*
|
||||
* @return string | false Version info on success, false on failure.
|
||||
*/
|
||||
function obtain_latest_version_info($force_update = false, $warn_fail = false, $ttl = 86400)
|
||||
{
|
||||
global $cache;
|
||||
|
||||
$info = $cache->get('versioncheck');
|
||||
|
||||
if ($info === false || $force_update)
|
||||
{
|
||||
$errstr = '';
|
||||
$errno = 0;
|
||||
|
||||
$info = get_remote_file('version.phpbb.com', '/phpbb',
|
||||
((defined('PHPBB_QA')) ? '30x_qa.txt' : '30x.txt'), $errstr, $errno);
|
||||
|
||||
if (empty($info))
|
||||
{
|
||||
$cache->destroy('versioncheck');
|
||||
if ($warn_fail)
|
||||
{
|
||||
trigger_error($errstr, E_USER_WARNING);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
$cache->put('versioncheck', $info, $ttl);
|
||||
}
|
||||
|
||||
return $info;
|
||||
}
|
||||
|
||||
/**
|
||||
* Enables a particular flag in a bitfield column of a given table.
|
||||
*
|
||||
|
Reference in New Issue
Block a user