aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authoricewind1991 <robin@icewind.nl>2014-03-17 13:21:54 +0100
committericewind1991 <robin@icewind.nl>2014-03-17 13:21:54 +0100
commit4112d63a4082b8e79c42f8295dfaa4e10ecf0f8c (patch)
treeb628106c95f943a518f928e59ae1558f2a51d9a3 /lib
parentbd98538a3646e4f7a56a16e93889e4d3079501d6 (diff)
parent1a116828cf00b434c5d3f5a3948393a714899df9 (diff)
downloadnextcloud-server-4112d63a4082b8e79c42f8295dfaa4e10ecf0f8c.tar.gz
nextcloud-server-4112d63a4082b8e79c42f8295dfaa4e10ecf0f8c.zip
Merge pull request #7727 from owncloud/cli-trusteddomainupgradewarning
Added warning for trusted_domains after CLI upgrade
Diffstat (limited to 'lib')
-rw-r--r--lib/private/updater.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/updater.php b/lib/private/updater.php
index fd2d46a1fac..dd8dc84e804 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -108,7 +108,7 @@ class Updater extends BasicEmitter {
/*
* START CONFIG CHANGES FOR OLDER VERSIONS
*/
- if (version_compare($currentVersion, '6.90.1', '<')) {
+ if (!\OC::$CLI && version_compare($currentVersion, '6.90.1', '<')) {
// Add the overwriteHost config if it is not existant
// This is added to prevent host header poisoning
\OC_Config::setValue('trusted_domains', \OC_Config::getValue('trusted_domains', array(\OC_Request::serverHost())));