diff options
author | Lukas Reschke <lukas@statuscode.ch> | 2016-11-18 21:42:56 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-18 21:42:56 +0100 |
commit | 8ec2e34576e84b256ee671f805a319ff27f3f944 (patch) | |
tree | 2166e9fdd683f8e9b82cea7419b679323fad44a6 /lib/private/Template/JSConfigHelper.php | |
parent | 4458e294bc6530ef226ead91bd6cb9f753697f32 (diff) | |
parent | 1614b310ef0e4871dc5f21630e887010e0fb22bc (diff) | |
download | nextcloud-server-8ec2e34576e84b256ee671f805a319ff27f3f944.tar.gz nextcloud-server-8ec2e34576e84b256ee671f805a319ff27f3f944.zip |
Merge pull request #1602 from nextcloud/ignore-mod-env
Add system config htaccess.IgnoreFrontController for prettyURLs w/o mod_env
Diffstat (limited to 'lib/private/Template/JSConfigHelper.php')
-rw-r--r-- | lib/private/Template/JSConfigHelper.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/Template/JSConfigHelper.php b/lib/private/Template/JSConfigHelper.php index eceaed0c380..a724c124de0 100644 --- a/lib/private/Template/JSConfigHelper.php +++ b/lib/private/Template/JSConfigHelper.php @@ -207,7 +207,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' => [ |