diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-10-13 13:18:24 +0400 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-10-13 19:21:33 +0400 |
| commit | 48a1e69f5e803d61edcd7d083fd8e794f5bf194d (patch) | |
| tree | 3477763335d51f42fbfe76fa73d5f5d31f4f2693 /lib/private/setup.php | |
| parent | d71fae51f8135dc98c3377d988dfe5095884f9a4 (diff) | |
Set overwrite.cli.url configs on setup
Correctly use overwrite.cli.url value when generating absolute urls in CLI
Fix #11500
Backport and squash of the following from master, in order:
- f0fcaff9b957f1e6c04f9bfd9b8e0eb84f78bbf8
- 923de0afd9a7e717a5e1d25747caf4840633db25
- a487ce76e86940c94801da6157bcf70ed4005c1f
- bd3ebdbd135b30946fdf55b41b5e96497d0c3e4a
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 274792297d9..2ad569cb483 100644 --- a/lib/private/setup.php +++ b/lib/private/setup.php @@ -82,7 +82,7 @@ class OC_Setup { //write the config file OC_Config::setValue('trusted_domains', $trustedDomains); OC_Config::setValue('datadirectory', $datadir); - OC_Config::setValue('overwritewebroot', OC::$WEBROOT); + OC_Config::setValue('overwrite.cli.url', \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost() . OC::$WEBROOT); OC_Config::setValue('dbtype', $dbtype); OC_Config::setValue('version', implode('.', OC_Util::getVersion())); try { |