summaryrefslogtreecommitdiffstats
path: root/owncloud-8.2.2-dont_update_htacess.patch
diff options
context:
space:
mode:
Diffstat (limited to 'owncloud-8.2.2-dont_update_htacess.patch')
-rw-r--r--owncloud-8.2.2-dont_update_htacess.patch51
1 files changed, 0 insertions, 51 deletions
diff --git a/owncloud-8.2.2-dont_update_htacess.patch b/owncloud-8.2.2-dont_update_htacess.patch
deleted file mode 100644
index 4db8819..0000000
--- a/owncloud-8.2.2-dont_update_htacess.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/lib/private/setup.php b/lib/private/setup.php
-index 8f1ae38..adc9f6a 100644
---- a/lib/private/setup.php
-+++ b/lib/private/setup.php
-@@ -369,12 +369,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 for apache hosts
-- if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) {
-- self::updateHtaccess();
-- self::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 9e5207c..6a169a6 100644
---- a/lib/private/updater.php
-+++ b/lib/private/updater.php
-@@ -285,14 +285,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)
-diff -up lib/private/setup.php.0 lib/private/setup.php
---- a/lib/private/setup.php.0 2016-03-23 08:12:31.399538916 +0100
-+++ b/lib/private/setup.php 2016-03-23 08:13:55.783981179 +0100
-@@ -415,6 +415,10 @@ class Setup {
- * @throws \OC\HintException If .htaccess does not include the current version
- */
- public static function updateHtaccess() {
-+
-+ // Should never be called, but for safety
-+ return;
-+
- $setupHelper = new \OC\Setup(\OC::$server->getConfig(), \OC::$server->getIniWrapper(),
- \OC::$server->getL10N('lib'), new \OC_Defaults(), \OC::$server->getLogger(),
- \OC::$server->getSecureRandom());
-