From 1ea59731f047ae281d95854e4b06cf6e85b76a97 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Wed, 5 Mar 2025 10:10:29 +0700
Subject: [PATCH] [ticket/17480] Use phpBB error message text instead of thrown
by GuzzleHTTP
PHPBB-17480
---
phpBB/language/en/common.php | 1 +
phpBB/phpbb/file_downloader.php | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 5694bbd5dc..5cdba377f5 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -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 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',
diff --git a/phpBB/phpbb/file_downloader.php b/phpBB/phpbb/file_downloader.php
index 3f87c9c512..e2becbfbfa 100644
--- a/phpBB/phpbb/file_downloader.php
+++ b/phpBB/phpbb/file_downloader.php
@@ -82,7 +82,7 @@ class file_downloader
}
catch (\RuntimeException $exception)
{
- throw new runtime_exception($exception->getMessage());
+ throw new runtime_exception('HTTP_HANDLER_NOT_FOUND');
}
// Set default values for error variables