Merge pull request phpbb#6788 from rxu/ticket/17480-2

[ticket/17480] Properly catch RuntimeException if no http handler is available

Author: marc1706

phpBB/language/en/common.php

@@ -357,6 +357,7 @@
 	'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',

phpBB/phpbb/file_downloader.php

@@ -75,8 +75,15 @@ protected function create_client(string $host, int $port = 443, int $timeout = 6
 	 */
 	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;