aboutsummaryrefslogtreecommitdiffstats
path: root/community/nextcloud/dont-update-htaccess.patch
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@alpinelinux.org>2018-01-19 14:43:57 +0000
committerLeonardo Arena <rnalrd@alpinelinux.org>2018-01-19 14:44:07 +0000
commit644f0448def8ea47927e1e0c62d52140079c1383 (patch)
tree7fa7b67b913a5c55d5e0301c7d315622d9803387 /community/nextcloud/dont-update-htaccess.patch
parentadcd0d27e5f1930d396249676f0cc173e79702a0 (diff)
community/nextcloud: upgrade to 13.0.0-rc2
Diffstat (limited to 'community/nextcloud/dont-update-htaccess.patch')
-rw-r--r--community/nextcloud/dont-update-htaccess.patch20
1 files changed, 4 insertions, 16 deletions
diff --git a/community/nextcloud/dont-update-htaccess.patch b/community/nextcloud/dont-update-htaccess.patch
index d0e3eb8cc6c..aecaebc7154 100644
--- a/community/nextcloud/dont-update-htaccess.patch
+++ b/community/nextcloud/dont-update-htaccess.patch
@@ -4,27 +4,15 @@ Patch ported from https://src.fedoraproject.org/cgit/rpms/nextcloud.git/tree/nex
--- a/core/register_command.php
+++ b/core/register_command.php
-@@ -124,7 +125,6 @@
+@@ -135,7 +135,6 @@
$application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateDB(\OC::$server->getMimeTypeDetector(), \OC::$server->getMimeTypeLoader()));
$application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateJS(\OC::$server->getMimeTypeDetector()));
$application->add(new OC\Core\Command\Maintenance\Mode(\OC::$server->getConfig()));
- $application->add(new OC\Core\Command\Maintenance\UpdateHtaccess());
+ $application->add(new OC\Core\Command\Maintenance\UpdateTheme(\OC::$server->getMimeTypeDetector(), \OC::$server->getMemCacheFactory()));
- $application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->getLogger()));
- $application->add(new OC\Core\Command\Maintenance\Repair(
---- a/lib/private/Setup.php
-+++ b/lib/private/Setup.php
-@@ -387,10 +387,6 @@
- // 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();
--
- self::installBackgroundJobs();
-
- //and we are done
+ $application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->query(\OC\Installer::class)));
+
--- a/lib/private/Updater.php
+++ b/lib/private/Updater.php
@@ -233,14 +233,6 @@