diff options
| author | Felix Epp <work@felixepp.de> | 2016-10-01 12:17:55 +0200 |
|---|---|---|
| committer | Felix A. Epp <work@felixepp.de> | 2016-11-16 22:28:49 +0100 |
| commit | 1614b310ef0e4871dc5f21630e887010e0fb22bc (patch) | |
| tree | 5a0780404a0920375a249613c9452b01e7766387 /lib/private/URLGenerator.php | |
| parent | 50929751b05e9ff09ecad7dde733178f7120e77c (diff) | |
| download | nextcloud-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/URLGenerator.php')
| -rw-r--r-- | lib/private/URLGenerator.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/URLGenerator.php b/lib/private/URLGenerator.php index 93517dc9f7e..1b8dfd70bde 100644 --- a/lib/private/URLGenerator.php +++ b/lib/private/URLGenerator.php @@ -3,6 +3,7 @@ * @copyright Copyright (c) 2016, ownCloud, Inc. * * @author Bart Visscher <bartv@thisnet.nl> + * @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> @@ -93,7 +94,7 @@ class URLGenerator implements IURLGenerator { * Returns a url to the given app and file. */ public function linkTo( $app, $file, $args = array() ) { - $frontControllerActive = (getenv('front_controller_active') === 'true'); + $frontControllerActive = ($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true'); if( $app != '' ) { $app_path = \OC_App::getAppPath($app); |