diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2017-07-21 14:50:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-21 14:50:31 +0200 |
| commit | 4c637a428ea9516b8e8c78a8ac8221669e20c082 (patch) | |
| tree | 010463d51860d27db3d5827099efb09d7c7b62fe /lib/private | |
| parent | a33b6cdd21868abf026375503a4eb5a36684c8eb (diff) | |
| parent | 1a4a68dbc6875b18a2c2ca45fd27990cc33b1d5e (diff) | |
| download | nextcloud-server-4c637a428ea9516b8e8c78a8ac8221669e20c082.tar.gz nextcloud-server-4c637a428ea9516b8e8c78a8ac8221669e20c082.zip | |
Merge pull request #5821 from nextcloud/fix-theming-on-untrusted-domain
Fix error message on untrusted domain error page
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/Server.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/Server.php b/lib/private/Server.php index be432c0cf28..c89931a2d1c 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -866,7 +866,7 @@ class Server extends ServerContainer implements IServerContainer { $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'), |