Merge pull request #5821 from nextcloud/fix-theming-on-untrusted-domain

Fix error message on untrusted domain error page
nextcloud · Jul 21, 2017 · 4c637a4 · 4c637a4
2 parents a33b6cd + 1a4a68d
commit 4c637a4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/private/Server.php b/lib/private/Server.php
@@ -866,7 +866,7 @@ public function __construct($webRoot, \OC\Config $config) {
 				$classExists = false;
 			}
 
-			if ($classExists && $c->getConfig()->getSystemValue('installed', false) && $c->getAppManager()->isInstalled('theming')) {
+			if ($classExists && $c->getConfig()->getSystemValue('installed', false) && $c->getAppManager()->isInstalled('theming') && $c->getTrustedDomainHelper()->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {
 				return new ThemingDefaults(
 					$c->getConfig(),
 					$c->getL10N('theming'),