diff options
Diffstat (limited to 'lib/private/URLGenerator.php')
| -rw-r--r-- | lib/private/URLGenerator.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/private/URLGenerator.php b/lib/private/URLGenerator.php index a5a3609703b..2410b8a9147 100644 --- a/lib/private/URLGenerator.php +++ b/lib/private/URLGenerator.php @@ -141,7 +141,7 @@ class URLGenerator implements IURLGenerator { * Returns a url to the given app and file. */ public function linkTo(string $appName, string $file, array $args = []): string { - $frontControllerActive = ($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true'); + $frontControllerActive = ($this->config->getSystemValueBool('htaccess.IgnoreFrontController', false) || getenv('front_controller_active') === 'true'); if ($appName !== '') { $app_path = $this->getAppManager()->getAppPath($appName); @@ -214,7 +214,7 @@ class URLGenerator implements IURLGenerator { // Check if the app is in the app folder $path = ''; - $themingEnabled = $this->config->getSystemValue('installed', false) && $this->getAppManager()->isEnabledForUser('theming'); + $themingEnabled = $this->config->getSystemValueBool('installed', false) && $this->getAppManager()->isEnabledForUser('theming'); $themingImagePath = false; if ($themingEnabled) { $themingDefaults = \OC::$server->getThemingDefaults(); @@ -275,7 +275,7 @@ class URLGenerator implements IURLGenerator { $separator = strpos($url, '/') === 0 ? '' : '/'; if (\OC::$CLI && !\defined('PHPUNIT_RUN')) { - return rtrim($this->config->getSystemValue('overwrite.cli.url'), '/') . '/' . ltrim($url, '/'); + return rtrim($this->config->getSystemValueString('overwrite.cli.url'), '/') . '/' . ltrim($url, '/'); } // The ownCloud web root can already be prepended. if (\OC::$WEBROOT !== '' && strpos($url, \OC::$WEBROOT) === 0) { @@ -313,7 +313,7 @@ class URLGenerator implements IURLGenerator { $appId = $this->getAppManager()->getDefaultAppForUser(); - if ($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true + if ($this->config->getSystemValueBool('htaccess.IgnoreFrontController', false) || getenv('front_controller_active') === 'true') { return $this->getAbsoluteURL('/apps/' . $appId . '/'); } |