Skip to content

Commit 64dd8b6

Browse files
committed
Merge branch 'prep-release-3.3.15' into 3.3.x
2 parents 430200c + 57abba6 commit 64dd8b6

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

phpBB/language/en/common.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,7 @@
357357
'HIDE_ME' => 'Hide my online status this session',
358358
'HOURS' => 'Hours',
359359
'HOME' => 'Home',
360+
'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.',
360361

361362
'ICQ' => 'ICQ',
362363
'IF' => 'If',

phpBB/phpbb/file_downloader.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,15 @@ protected function create_client(string $host, int $port = 443, int $timeout = 6
7575
*/
7676
public function get(string $host, string $directory, string $filename, int $port = 443, int $timeout = 6)
7777
{
78-
// Initialize Guzzle client
79-
$client = $this->create_client($host, $port, $timeout);
78+
try
79+
{
80+
// Initialize Guzzle client
81+
$client = $this->create_client($host, $port, $timeout);
82+
}
83+
catch (\RuntimeException $exception)
84+
{
85+
throw new runtime_exception('HTTP_HANDLER_NOT_FOUND');
86+
}
8087

8188
// Set default values for error variables
8289
$this->error_number = 0;

0 commit comments

Comments
 (0)