From 6b2216f0d6ca610178ef295c1a9c6e246f5fc6da Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Sat, 5 Jan 2013 11:09:48 -0500 Subject: [PATCH] Remove old data directory protection from update, should already have taken place or not working because the server isn't Apache --- core/ajax/update.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/core/ajax/update.php b/core/ajax/update.php index 0d58f17f097..1c77a4ab67e 100644 --- a/core/ajax/update.php +++ b/core/ajax/update.php @@ -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'); -- 2.39.5