summaryrefslogtreecommitdiffstats
path: root/lib/private/Route
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/Route
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/Route')
-rw-r--r--lib/private/Route/Router.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/Route/Router.php b/lib/private/Route/Router.php
index 59f403d66e8..fd15400dad4 100644
--- a/lib/private/Route/Router.php
+++ b/lib/private/Route/Router.php
@@ -4,6 +4,7 @@
*
* @author Bart Visscher <bartv@thisnet.nl>
* @author Bernhard Posselt <dev@bernhard-posselt.com>
+ * @author Felix Anand Epp <work@felixepp.de>
* @author Joas Schilling <coding@schilljs.com>
* @author Jörn Friedrich Dreyer <jfd@butonic.de>
* @author Lukas Reschke <lukas@statuscode.ch>
@@ -71,7 +72,7 @@ class Router implements IRouter {
public function __construct(ILogger $logger) {
$this->logger = $logger;
$baseUrl = \OC::$WEBROOT;
- if(!(getenv('front_controller_active') === 'true')) {
+ if(!(\OC::$server->getConfig()->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true')) {
$baseUrl = \OC::$server->getURLGenerator()->linkTo('', 'index.php');
}
if (!\OC::$CLI) {