summaryrefslogtreecommitdiffstats
path: root/lib/private/updater.php
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2014-02-28 11:59:30 +0100
committerLukas Reschke <lukas@statuscode.ch>2014-02-28 11:59:30 +0100
commit357fdb1a4df64864b2394d097b855fded1ce4756 (patch)
tree94e2c48d3b91a67ec7000178754fada5fd4be314 /lib/private/updater.php
parent61bc76fdd6fea722d8f77dd48ae66c294a1fe322 (diff)
downloadnextcloud-server-357fdb1a4df64864b2394d097b855fded1ce4756.tar.gz
nextcloud-server-357fdb1a4df64864b2394d097b855fded1ce4756.zip
Remove .htaccess creation code
1. We're maintaining the same code twice which leads inevitably to problems as this one. The createHtaccess routine is only used to use the correct paths to the 404 and 403 document. 2. Updating the ownCloud instance as described in our documentation (`Delete everything from your ownCloud installation directory, except data and config.`) will break the links to the ErrorDocuments anyways and show the default error handlers if ownCloud is not installed in the root directory.
Diffstat (limited to 'lib/private/updater.php')
-rw-r--r--lib/private/updater.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/private/updater.php b/lib/private/updater.php
index f05d5038b76..67764771fd0 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -92,6 +92,7 @@ class Updater extends BasicEmitter {
/**
* runs the update actions in maintenance mode, does not upgrade the source files
+ * except the main .htaccess file
*/
public function upgrade() {
\OC_DB::enableCaching(false);
@@ -103,6 +104,11 @@ class Updater extends BasicEmitter {
}
$this->emit('\OC\Updater', 'maintenanceStart');
+ // Update htaccess files for apache hosts
+ if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) {
+ \OC_Setup::updateHtaccess();
+ }
+
/*
* START CONFIG CHANGES FOR OLDER VERSIONS
*/