From 68dacf2b5b198dac82f38b09617175b4087f9af1 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Tue, 31 May 2016 16:32:29 +0200
Subject: owncloud: 9.0.2

---
 owncloud-9.0.1-dont_update_htacess.patch | 47 ++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 owncloud-9.0.1-dont_update_htacess.patch

(limited to 'owncloud-9.0.1-dont_update_htacess.patch')

diff --git a/owncloud-9.0.1-dont_update_htacess.patch b/owncloud-9.0.1-dont_update_htacess.patch
new file mode 100644
index 0000000..d6c4efe
--- /dev/null
+++ b/owncloud-9.0.1-dont_update_htacess.patch
@@ -0,0 +1,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)
-- 
cgit