Mirrors
/
nextcloud-server
mirror of https://github.com/nextcloud/server
3
0
Fork 0
Code Releases Activity
Browse Source

Use the untrusted domain in the installer

remotes/origin/log-external-deletes
Lukas Reschke 11 years ago
parent
1a41f8f6f9
commit
a666f804c7
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      lib/private/setup.php

4
lib/private/setup.php
View File

@ -164,7 +164,7 @@ class OC_Setup {
&& is_array($options['trusted_domains'])) { && is_array($options['trusted_domains'])) {
$trustedDomains = $options['trusted_domains']; $trustedDomains = $options['trusted_domains'];
} else { } else {
$trustedDomains = [\OCP\Util::getServerHostName()];
$trustedDomains = [$request->getInsecureServerHost()];
} }
if (OC_Util::runningOnWindows()) { if (OC_Util::runningOnWindows()) {
@ -187,7 +187,7 @@ class OC_Setup {
'secret' => $secret, 'secret' => $secret,
'trusted_domains' => $trustedDomains, 'trusted_domains' => $trustedDomains,
'datadirectory' => $dataDir, 'datadirectory' => $dataDir,
'overwrite.cli.url' => $request->getServerProtocol() . '://' . $request->getServerHost() . OC::$WEBROOT,
'overwrite.cli.url' => $request->getServerProtocol() . '://' . $request->getInsecureServerHost() . OC::$WEBROOT,
'dbtype' => $dbType, 'dbtype' => $dbType,
'version' => implode('.', OC_Util::getVersion()), 'version' => implode('.', OC_Util::getVersion()),
]); ]);

Write Preview
Loading…
Cancel
Save