Merge pull request #11119 from owncloud/removeOldUpgradeRoutines
Remove old upgrade routines
This commit is contained in:
commit
437f8c3cd5
|
@ -187,19 +187,6 @@ class Updater extends BasicEmitter {
|
||||||
// (in case it didn't exist before)
|
// (in case it didn't exist before)
|
||||||
file_put_contents(\OC_Config::getValue('datadirectory', \OC::$SERVERROOT . '/data') . '/.ocdata', '');
|
file_put_contents(\OC_Config::getValue('datadirectory', \OC::$SERVERROOT . '/data') . '/.ocdata', '');
|
||||||
|
|
||||||
/*
|
|
||||||
* START CONFIG CHANGES FOR OLDER VERSIONS
|
|
||||||
*/
|
|
||||||
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())));
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* STOP CONFIG CHANGES FOR OLDER VERSIONS
|
|
||||||
*/
|
|
||||||
|
|
||||||
// pre-upgrade repairs
|
// pre-upgrade repairs
|
||||||
$repair = new \OC\Repair(\OC\Repair::getBeforeUpgradeRepairSteps());
|
$repair = new \OC\Repair(\OC\Repair::getBeforeUpgradeRepairSteps());
|
||||||
$repair->run();
|
$repair->run();
|
||||||
|
@ -213,13 +200,6 @@ class Updater extends BasicEmitter {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 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 ($this->updateStepEnabled) {
|
if ($this->updateStepEnabled) {
|
||||||
$this->doCoreUpgrade();
|
$this->doCoreUpgrade();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue