Remove old data directory protection from update, should already have taken place or not working because the server isn't Apache
This commit is contained in:
parent
a94405b4e4
commit
6b2216f0d6
|
@ -10,14 +10,6 @@ if (OC::checkUpgrade(false)) {
|
||||||
OC_Hook::connect('update', 'error', $watcher, 'error');
|
OC_Hook::connect('update', 'error', $watcher, 'error');
|
||||||
OC_Hook::connect('update', 'error', $watcher, 'failure');
|
OC_Hook::connect('update', 'error', $watcher, 'failure');
|
||||||
$watcher->success('Turned on maintenance mode');
|
$watcher->success('Turned on maintenance mode');
|
||||||
// Check if the .htaccess is existing - this is needed for upgrades from really old ownCloud versions
|
|
||||||
if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) {
|
|
||||||
if (!OC_Util::ishtaccessworking()) {
|
|
||||||
if (!file_exists(OC::$SERVERROOT . '/data/.htaccess')) {
|
|
||||||
OC_Setup::protectDataDirectory();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$result = OC_DB::updateDbFromStructure(OC::$SERVERROOT.'/db_structure.xml');
|
$result = OC_DB::updateDbFromStructure(OC::$SERVERROOT.'/db_structure.xml');
|
||||||
if (!$result) {
|
if (!$result) {
|
||||||
$watcher->failure('Error updating database');
|
$watcher->failure('Error updating database');
|
||||||
|
|
Loading…
Reference in New Issue