diff options
author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2024-05-30 17:52:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-30 17:52:14 +0200 |
commit | 4d9199fb8879482e5c7615a57daed24dd0d761f6 (patch) | |
tree | e9d52bd178cc85ad02aa3e4f9e3866789e66d330 /lib/private/legacy | |
parent | 0963336fb1565fe8b7c496fccda5c74c06f863a5 (diff) | |
parent | be4e97d1dc309826a970700862f1e066231922c7 (diff) | |
download | nextcloud-server-4d9199fb8879482e5c7615a57daed24dd0d761f6.tar.gz nextcloud-server-4d9199fb8879482e5c7615a57daed24dd0d761f6.zip |
Merge branch 'master' into refactor/OC-Server-getL10NFactory
Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>
Diffstat (limited to 'lib/private/legacy')
-rw-r--r-- | lib/private/legacy/OC_Util.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php index 2c7390881c0..14918dfe89a 100644 --- a/lib/private/legacy/OC_Util.php +++ b/lib/private/legacy/OC_Util.php @@ -9,6 +9,7 @@ use bantu\IniGetWrapper\IniGetWrapper; use OC\Authentication\TwoFactorAuth\Manager as TwoFactorAuthManager; use OC\Files\SetupManager; use OCP\Files\Template\ITemplateManager; +use OCP\Http\Client\IClientService; use OCP\IConfig; use OCP\IGroupManager; use OCP\IURLGenerator; @@ -878,7 +879,7 @@ class OC_Util { // accessing the file via http $url = \OC::$server->getURLGenerator()->getAbsoluteURL(OC::$WEBROOT . '/data' . $fileName); try { - $content = \OC::$server->getHTTPClientService()->newClient()->get($url)->getBody(); + $content = \OC::$server->get(IClientService::class)->newClient()->get($url)->getBody(); } catch (\Exception $e) { $content = false; } @@ -890,7 +891,7 @@ class OC_Util { } try { - $fallbackContent = \OC::$server->getHTTPClientService()->newClient()->get($url)->getBody(); + $fallbackContent = \OC::$server->get(IClientService::class)->newClient()->get($url)->getBody(); } catch (\Exception $e) { $fallbackContent = false; } |