diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-02-18 13:59:37 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-02-18 13:59:37 +0100 |
| commit | a666f804c76c90c19e6c27637642b7b4b9418d56 (patch) | |
| tree | 5bd1b1526564bc38ac21ef4c072fc79b3e055573 /lib | |
| parent | 1a41f8f6f9e1e5edf942a6032197190f3dda9879 (diff) | |
| download | nextcloud-server-a666f804c76c90c19e6c27637642b7b4b9418d56.tar.gz nextcloud-server-a666f804c76c90c19e6c27637642b7b4b9418d56.zip | |
Use the untrusted domain in the installer
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/setup.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/setup.php b/lib/private/setup.php index a3b46c1eb4f..ede3a452c29 100644 --- a/lib/private/setup.php +++ b/lib/private/setup.php @@ -164,7 +164,7 @@ class OC_Setup { && is_array($options['trusted_domains'])) { $trustedDomains = $options['trusted_domains']; } else { - $trustedDomains = [\OCP\Util::getServerHostName()]; + $trustedDomains = [$request->getInsecureServerHost()]; } if (OC_Util::runningOnWindows()) { @@ -187,7 +187,7 @@ class OC_Setup { 'secret' => $secret, 'trusted_domains' => $trustedDomains, 'datadirectory' => $dataDir, - 'overwrite.cli.url' => $request->getServerProtocol() . '://' . $request->getServerHost() . OC::$WEBROOT, + 'overwrite.cli.url' => $request->getServerProtocol() . '://' . $request->getInsecureServerHost() . OC::$WEBROOT, 'dbtype' => $dbType, 'version' => implode('.', OC_Util::getVersion()), ]); |