summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2014-12-08 12:52:54 +0100
committerMorris Jobke <hey@morrisjobke.de>2014-12-08 12:52:54 +0100
commit2ec4ca38d23b105c070adae67b5d42e7a30c5bc4 (patch)
treef913417074d6731f987c541b82461ce3280a1ebc
parentd3188159d2f2aca64bdc2ec3c3eccfbbfb0b5725 (diff)
parent8b9cc5c25b402268b4c383db7ff92c84de8c6b56 (diff)
downloadnextcloud-server-2ec4ca38d23b105c070adae67b5d42e7a30c5bc4.tar.gz
nextcloud-server-2ec4ca38d23b105c070adae67b5d42e7a30c5bc4.zip
Merge pull request #12691 from owncloud/i-shall-improve-my-grep-skills
Remove unexisting `htAccessWorkinght`
-rw-r--r--settings/admin.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/settings/admin.php b/settings/admin.php
index 4b70848bd5b..bb5f47b36a9 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -76,7 +76,7 @@ $template->assign('databaseOverload', $databaseOverload);
$forms = OC_App::getForms('admin');
$l = OC_L10N::get('settings');
$formsAndMore = array();
-if (OC_Request::serverProtocol() !== 'https' || !$htAccessWorking || !OC_Util::isAnnotationsWorking() ||
+if (OC_Request::serverProtocol() !== 'https' || !OC_Util::isAnnotationsWorking() ||
$suggestedOverwriteWebRoot || !OC_Util::isSetLocaleWorking() || !OC_Util::isPhpCharSetUtf8() ||
!OC_Util::fileInfoLoaded() || $databaseOverload
) {