summaryrefslogtreecommitdiffstats
path: root/owncloud-9.0.1-dont_update_htacess.patch
blob: d6c4efefeafd014f5d12df233db8a282d75a9c82 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
diff --git a/lib/private/setup.php b/lib/private/setup.php
index 6303d0d..7c30955 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -373,10 +373,6 @@ class Setup {
 			// out that this is indeed an ownCloud data directory
 			file_put_contents($config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/.ocdata', '');
 
-			// Update .htaccess files
-			Setup::updateHtaccess();
-			Setup::protectDataDirectory();
-
 			//try to write logtimezone
 			if (date_default_timezone_get()) {
 				$config->setSystemValue('logtimezone', date_default_timezone_get());
diff --git a/lib/private/updater.php b/lib/private/updater.php
index 0d567b8..6b0b1ad 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -55,10 +55,10 @@ class Updater extends BasicEmitter {
 
 	/** @var ILogger $log */
 	private $log;
-	
+
 	/** @var \OC\HTTPHelper $helper */
 	private $httpHelper;
-	
+
 	/** @var IConfig */
 	private $config;
 
@@ -294,14 +294,6 @@ class Updater extends BasicEmitter {
 			throw new \Exception('Updates between multiple major versions and downgrades are unsupported.');
 		}
 
-		// Update .htaccess files
-		try {
-			Setup::updateHtaccess();
-			Setup::protectDataDirectory();
-		} catch (\Exception $e) {
-			throw new \Exception($e->getMessage());
-		}
-
 		// create empty file in data dir, so we can later find
 		// out that this is indeed an ownCloud data directory
 		// (in case it didn't exist before)