makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2025-03-08 09:07:58 +01:00
commit 023f56dff9
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/language/en/common.php
View file

@ -352,6 +352,7 @@ $lang = array_merge($lang, array(
'HIDE_ME' => 'Hide my online status this session', 'HIDE_ME' => 'Hide my online status this session',
'HOURS' => 'Hours', 'HOURS' => 'Hours',
'HOME' => 'Home', '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', 'ICQ' => 'ICQ',
'IF' => 'If', 'IF' => 'If',

7
phpBB/phpbb/file_downloader.php
View file

@ -74,9 +74,16 @@ class file_downloader
* message is returned * message is returned
*/ */
public function get(string $host, string $directory, string $filename, int $port = 443, int $timeout = 6): bool|string public function get(string $host, string $directory, string $filename, int $port = 443, int $timeout = 6): bool|string
{
try
{ {
// Initialize Guzzle client // Initialize Guzzle client
$client = $this->create_client($host, $port, $timeout); $client = $this->create_client($host, $port, $timeout);
}
catch (\RuntimeException $exception)
{
throw new runtime_exception('HTTP_HANDLER_NOT_FOUND');
}
// Set default values for error variables // Set default values for error variables
$this->error_number = 0; $this->error_number = 0;