From 7840065569de84a135711318d66e5bcf8827097e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 5 Jul 2015 07:54:26 +0200 Subject: owncloud: import 8.0.4 from rawhide --- owncloud-8.0.3-dont_update_htacess.patch | 37 ++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 owncloud-8.0.3-dont_update_htacess.patch (limited to 'owncloud-8.0.3-dont_update_htacess.patch') diff --git a/owncloud-8.0.3-dont_update_htacess.patch b/owncloud-8.0.3-dont_update_htacess.patch new file mode 100644 index 0000000..db34f90 --- /dev/null +++ b/owncloud-8.0.3-dont_update_htacess.patch @@ -0,0 +1,37 @@ +diff --git a/lib/private/setup.php b/lib/private/setup.php +index e3a29b6..7eeeb92 100644 +--- a/lib/private/setup.php ++++ b/lib/private/setup.php +@@ -230,12 +230,6 @@ class OC_Setup { + // out that this is indeed an ownCloud data directory + file_put_contents(OC_Config::getValue('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(); +- } +- + //and we are done + OC_Config::setValue('installed', true); + } +diff --git a/lib/private/updater.php b/lib/private/updater.php +index 08731c7..2b722e3 100644 +--- a/lib/private/updater.php ++++ b/lib/private/updater.php +@@ -202,15 +202,6 @@ class Updater extends BasicEmitter { + throw new \Exception('Updates between multiple major versions are unsupported.'); + } + +- // Update htaccess files for apache hosts +- if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) { +- try { +- \OC_Setup::updateHtaccess(); +- } 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