summaryrefslogtreecommitdiffstats
path: root/lib/private/setup.php
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2015-12-01 17:06:48 +0100
committerLukas Reschke <lukas@owncloud.com>2015-12-08 08:16:24 +0100
commit0a89073c475632a296b7315d96894503a78bbf43 (patch)
treed76cf3078efce7d80308a6fa55b9694d82388f5b /lib/private/setup.php
parent235094ab5492990ed4790e5d475beedf3528705a (diff)
downloadnextcloud-server-0a89073c475632a296b7315d96894503a78bbf43.tar.gz
nextcloud-server-0a89073c475632a296b7315d96894503a78bbf43.zip
Run .htaccess updates in any case
This is the same what we also do in updater.php and thus this aligns the code. Makes the code paths more consistent.
Diffstat (limited to 'lib/private/setup.php')
-rw-r--r--lib/private/setup.php8
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/private/setup.php b/lib/private/setup.php
index 33a9fe44462..4a555b3e415 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -369,11 +369,9 @@ class Setup {
// out that this is indeed an ownCloud data directory
file_put_contents($config->getSystemValue('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();
- }
+ // Update .htaccess files
+ Setup::updateHtaccess();
+ Setup::protectDataDirectory();
//try to write logtimezone
if (date_default_timezone_get()) {