mirror of
https://github.com/phpbb/phpbb.git
synced 2025-04-21 00:02:18 +02:00
Merge branch 'prep-release-3.3.15' into 3.3.x
This commit is contained in:
commit
64dd8b668e
@ -357,6 +357,7 @@ $lang = array_merge($lang, array(
|
||||
'HIDE_ME' => 'Hide my online status this session',
|
||||
'HOURS' => 'Hours',
|
||||
'HOME' => 'Home',
|
||||
'HTTP_HANDLER_NOT_FOUND' => 'The operation could not be completed because the cURL PHP extension and allow_url_fopen PHP ini setting have been disabled and no other HTTP handler could be found.',
|
||||
|
||||
'ICQ' => 'ICQ',
|
||||
'IF' => 'If',
|
||||
|
@ -75,8 +75,15 @@ class file_downloader
|
||||
*/
|
||||
public function get(string $host, string $directory, string $filename, int $port = 443, int $timeout = 6)
|
||||
{
|
||||
// Initialize Guzzle client
|
||||
$client = $this->create_client($host, $port, $timeout);
|
||||
try
|
||||
{
|
||||
// Initialize Guzzle client
|
||||
$client = $this->create_client($host, $port, $timeout);
|
||||
}
|
||||
catch (\RuntimeException $exception)
|
||||
{
|
||||
throw new runtime_exception('HTTP_HANDLER_NOT_FOUND');
|
||||
}
|
||||
|
||||
// Set default values for error variables
|
||||
$this->error_number = 0;
|
||||
|
Loading…
x
Reference in New Issue
Block a user