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/URLGenerator.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/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 bdf7bdafae3..f041487ea88 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); |