diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-10-13 11:18:24 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-10-14 05:07:09 +0200 |
| commit | 0407bc097895355b90bc722e8b58afb27a40d538 (patch) | |
| tree | 44634a277863ee776251b260a4fcdca7dd483d2b /lib/private/setup.php | |
| parent | baffe5353f3fd57fd9ecb353ae81bf3164896f6f (diff) | |
| download | nextcloud-server-0407bc097895355b90bc722e8b58afb27a40d538.tar.gz nextcloud-server-0407bc097895355b90bc722e8b58afb27a40d538.zip | |
Set overwritemailurl* configs on setup
Correctly use overwritemailurl value when generating absolute urls in CLI
Fix #11500
Rename the config to *cli
Add overwrite.cli.url to the sample config
Revert separator fix, fixes unit test
Diffstat (limited to 'lib/private/setup.php')
| -rw-r--r-- | lib/private/setup.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/setup.php b/lib/private/setup.php index b1b3388f81b..75dc1987ee6 100644 --- a/lib/private/setup.php +++ b/lib/private/setup.php @@ -86,7 +86,7 @@ class OC_Setup { //write the config file \OC::$server->getConfig()->setSystemValue('trusted_domains', $trustedDomains); \OC::$server->getConfig()->setSystemValue('datadirectory', $datadir); - \OC::$server->getConfig()->setSystemValue('overwritewebroot', OC::$WEBROOT); + \OC::$server->getConfig()->setSystemValue('overwrite.cli.url', \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost() . OC::$WEBROOT); \OC::$server->getConfig()->setSystemValue('dbtype', $dbtype); \OC::$server->getConfig()->setSystemValue('version', implode('.', OC_Util::getVersion())); |