diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2018-11-28 22:19:36 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2018-11-28 22:19:36 +0000 |
| commit | 9fc671264764cd0765830572daa11574c92fdba8 (patch) | |
| tree | 580da54b1f122edd844dd8bb9a3e6c1ab0c05156 /user/nextcloud/dont-update-htaccess.patch | |
| parent | b0ec6a7873c7835965e2bb923e0d87ea345352d4 (diff) | |
| parent | 020a30d93a101127fdd2f494026fc80c632ae728 (diff) | |
| download | packages-9fc671264764cd0765830572daa11574c92fdba8.tar.gz packages-9fc671264764cd0765830572daa11574c92fdba8.tar.bz2 packages-9fc671264764cd0765830572daa11574c92fdba8.tar.xz packages-9fc671264764cd0765830572daa11574c92fdba8.zip | |
Merge branch 'nextcloud' into 'master'
user/nextcloud: new package
See merge request !110
Diffstat (limited to 'user/nextcloud/dont-update-htaccess.patch')
| -rw-r--r-- | user/nextcloud/dont-update-htaccess.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/user/nextcloud/dont-update-htaccess.patch b/user/nextcloud/dont-update-htaccess.patch new file mode 100644 index 000000000..aecaebc71 --- /dev/null +++ b/user/nextcloud/dont-update-htaccess.patch @@ -0,0 +1,32 @@ +Don't mess with .htaccess files. + +Patch ported from https://src.fedoraproject.org/cgit/rpms/nextcloud.git/tree/nextcloud-9.1.0-dont_update_htacess.patch + +--- a/core/register_command.php ++++ b/core/register_command.php +@@ -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(), \OC::$server->query(\OC\Installer::class))); + +--- a/lib/private/Updater.php ++++ b/lib/private/Updater.php +@@ -233,14 +233,6 @@ + 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) |