Skip to content
Snippets Groups Projects
Commit 6b2216f0 authored by Michael Gapczynski's avatar Michael Gapczynski
Browse files

Remove old data directory protection from update, should already have taken...

Remove old data directory protection from update, should already have taken place or not working because the server isn't Apache
parent a94405b4
No related branches found
No related tags found
No related merge requests found
......@@ -10,14 +10,6 @@ if (OC::checkUpgrade(false)) {
OC_Hook::connect('update', 'error', $watcher, 'error');
OC_Hook::connect('update', 'error', $watcher, 'failure');
$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');
if (!$result) {
$watcher->failure('Error updating database');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment