diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2014-06-04 11:07:31 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2014-06-05 15:49:34 +0200 |
| commit | 6578f00b4bcfbd5bc44bc12e341506f922498d7b (patch) | |
| tree | 6ef948934965edb35a6852ca75144848844b7722 /lib/private/updater.php | |
| parent | cf9099c7885453bcf15e40cbed722f432dffa1fb (diff) | |
| download | nextcloud-server-6578f00b4bcfbd5bc44bc12e341506f922498d7b.tar.gz nextcloud-server-6578f00b4bcfbd5bc44bc12e341506f922498d7b.zip | |
unify share settings
Diffstat (limited to 'lib/private/updater.php')
| -rw-r--r-- | lib/private/updater.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/private/updater.php b/lib/private/updater.php index 106970c4121..29923d76294 100644 --- a/lib/private/updater.php +++ b/lib/private/updater.php @@ -53,7 +53,7 @@ class Updater extends BasicEmitter { $version = \OC_Util::getVersion(); $version['installed'] = \OC_Appconfig::getValue('core', 'installedat'); $version['updated'] = \OC_Appconfig::getValue('core', 'lastupdatedat'); - $version['updatechannel'] = \OC_Util::getChannel(); + $version['updatechannel'] = \OC_Util::getChannel(); $version['edition'] = \OC_Util::getEditionString(); $version['build'] = \OC_Util::getBuild(); $versionString = implode('x', $version); @@ -119,7 +119,7 @@ class Updater extends BasicEmitter { if (!\OC::$CLI && version_compare($installedVersion, '6.90.1', '<')) { // Add the trusted_domains 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()))); + \OC_Config::setValue('trusted_domains', \OC_Config::getValue('trusted_domains', array(\OC_Request::serverHost()))); } /* * STOP CONFIG CHANGES FOR OLDER VERSIONS @@ -151,6 +151,13 @@ class Updater extends BasicEmitter { $this->emit('\OC\Updater', 'failure', array($exception->getMessage())); } + // upgrade from OC6 to OC7 + // TODO removed it again for OC8 + $sharePolicy = \OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global'); + if ($sharePolicy === 'groups_only') { + \OC_Appconfig::setValue('core', 'shareapi_only_share_with_group_members', 'yes'); + } + if ($canUpgrade) { // proceed with real upgrade try { |