summaryrefslogtreecommitdiffstats
path: root/lib/setup.php
diff options
context:
space:
mode:
authorGeorg Ehrke <dev@georgswebsite.de>2012-07-15 16:56:38 +0200
committerGeorg Ehrke <dev@georgswebsite.de>2012-07-15 16:56:38 +0200
commitd49b789348315be677e66593eaca43e0e399d3da (patch)
treeb29917fc50f3145e89b4f938076bc6353887585d /lib/setup.php
parent55754939009a51da1ed8350d372d8d6f7e7768a5 (diff)
parent160e701fbf4d87e9673114f0dd51c6705e180475 (diff)
downloadnextcloud-server-d49b789348315be677e66593eaca43e0e399d3da.tar.gz
nextcloud-server-d49b789348315be677e66593eaca43e0e399d3da.zip
Merge branch 'master' into calendar_import
Diffstat (limited to 'lib/setup.php')
-rw-r--r--lib/setup.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/setup.php b/lib/setup.php
index 2f73c486c9c..027c84db092 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -257,7 +257,7 @@ class OC_Setup {
OC_Installer::installShippedApps();
//create htaccess files for apache hosts
- if (strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) {
+ if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) {
self::createHtaccess();
}