Refactor OC\Server::getTrustedDomainHelper

summersab · skjnldsv · commit 55eb6048fa11 · 2024-02-23T15:45:40.000+01:00
Signed-off-by: Andrew Summers &lt;18727110+summersab@users.noreply.github.com&gt;
diff --git a/lib/private/Server.php b/lib/private/Server.php
@@ -1174,7 +1174,7 @@ public function __construct($webRoot, \OC\Config $config) {
 				$classExists = false;
 			}
 
-			if ($classExists && $c->get(\OCP\IConfig::class)->getSystemValueBool('installed', false) && $c->get(IAppManager::class)->isInstalled('theming') && $c->getTrustedDomainHelper()->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {
+			if ($classExists && $c->get(\OCP\IConfig::class)->getSystemValueBool('installed', false) && $c->get(IAppManager::class)->isInstalled('theming') && $c->get(TrustedDomainHelper::class)->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {
 				$imageManager = new ImageManager(
 					$c->get(\OCP\IConfig::class),
 					$c->getAppDataDir('theming'),

Original file line number	Diff line number	Diff line change
`@@ -1174,7 +1174,7 @@ public function __construct($webRoot, \OC\Config $config) {`
`1174`	`1174`	`$classExists = false;`
`1175`	`1175`	`}`
`1176`	`1176`
`1177`		`- if ($classExists && $c->get(\OCP\IConfig::class)->getSystemValueBool('installed', false) && $c->get(IAppManager::class)->isInstalled('theming') && $c->getTrustedDomainHelper()->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {`
	`1177`	`+ if ($classExists && $c->get(\OCP\IConfig::class)->getSystemValueBool('installed', false) && $c->get(IAppManager::class)->isInstalled('theming') && $c->get(TrustedDomainHelper::class)->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {`
`1178`	`1178`	`$imageManager = new ImageManager(`
`1179`	`1179`	`$c->get(\OCP\IConfig::class),`
`1180`	`1180`	`$c->getAppDataDir('theming'),`