summaryrefslogtreecommitdiffstats
path: root/lib/private/Template
diff options
context:
space:
mode:
authorFelix Epp <work@felixepp.de>2016-10-01 12:17:55 +0200
committerFelix A. Epp <work@felixepp.de>2016-11-16 22:28:49 +0100
commit1614b310ef0e4871dc5f21630e887010e0fb22bc (patch)
tree5a0780404a0920375a249613c9452b01e7766387 /lib/private/Template
parent50929751b05e9ff09ecad7dde733178f7120e77c (diff)
downloadnextcloud-server-1614b310ef0e4871dc5f21630e887010e0fb22bc.tar.gz
nextcloud-server-1614b310ef0e4871dc5f21630e887010e0fb22bc.zip
Add system config htaccess.IgnoreFrontController for prettyURLs w/o mod_env
Added the system config which sets all conditions to true that query the FrontControllerActive mod_env variable. Signed-off-by: Felix A. Epp <work@felixepp.de>
Diffstat (limited to 'lib/private/Template')
-rw-r--r--lib/private/Template/JSConfigHelper.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/Template/JSConfigHelper.php b/lib/private/Template/JSConfigHelper.php
index a7f8c251cee..0993663fef9 100644
--- a/lib/private/Template/JSConfigHelper.php
+++ b/lib/private/Template/JSConfigHelper.php
@@ -189,7 +189,7 @@ class JSConfigHelper {
'versionstring' => \OC_Util::getVersionString(),
'enable_avatars' => $this->config->getSystemValue('enable_avatars', true) === true,
'lost_password_link'=> $this->config->getSystemValue('lost_password_link', null),
- 'modRewriteWorking' => (getenv('front_controller_active') === 'true'),
+ 'modRewriteWorking' => (\OC::$server->getConfig()->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true'),
]),
"oc_appconfig" => json_encode([
'core' => [