diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2024-05-30 17:51:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-30 17:51:40 +0200 |
| commit | 84d40a76f966e7e487de5cad9cd3e27baaf44fcc (patch) | |
| tree | 98ee651b302ab21a5145fcaca140e476d0c2c6e9 /lib/private/legacy | |
| parent | cc7e6e5e4c1204cdf92d5ae5a665f75d04d39abb (diff) | |
| parent | be4e97d1dc309826a970700862f1e066231922c7 (diff) | |
| download | nextcloud-server-84d40a76f966e7e487de5cad9cd3e27baaf44fcc.tar.gz nextcloud-server-84d40a76f966e7e487de5cad9cd3e27baaf44fcc.zip | |
Merge branch 'master' into refactor/OC-Server-getCsrfTokenManager
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 8be4c81c2cd..4b89b01469a 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; @@ -877,7 +878,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; } @@ -889,7 +890,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; } |