diff options
author | Remi Collet <fedora@famillecollet.com> | 2016-03-16 13:43:36 +0100 |
---|---|---|
committer | Remi Collet <fedora@famillecollet.com> | 2016-03-16 13:43:36 +0100 |
commit | cf476b262715557a3dc523f9878b49fd15708705 (patch) | |
tree | 080577ebcf9a2fecf01d529228e1630d9a4c23e2 /owncloud-8.0.3-dont_update_htacess.patch | |
parent | b15855909305e99fea24b4874827d8100f49cfef (diff) |
owncloud 8.1.5 (backported from Fedora)
Diffstat (limited to 'owncloud-8.0.3-dont_update_htacess.patch')
-rw-r--r-- | owncloud-8.0.3-dont_update_htacess.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/owncloud-8.0.3-dont_update_htacess.patch b/owncloud-8.0.3-dont_update_htacess.patch deleted file mode 100644 index db34f90..0000000 --- a/owncloud-8.0.3-dont_update_htacess.patch +++ /dev/null @@ -1,37 +0,0 @@ -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) |