diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-01-07 09:02:33 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-01-07 09:02:33 +0100 |
| commit | 3d997e8c62bd752f38bcc11f02fb2af0e46d9154 (patch) | |
| tree | d944a45085ef44843ab6e258a2980a6034fc0be6 /settings/admin.php | |
| parent | 2daf90dae64aaf1143a133ba99505a8a9d39ff9f (diff) | |
| download | nextcloud-server-3d997e8c62bd752f38bcc11f02fb2af0e46d9154.tar.gz nextcloud-server-3d997e8c62bd752f38bcc11f02fb2af0e46d9154.zip | |
Fix incorrect warning about setting the overwrite.cli.url
Diffstat (limited to 'settings/admin.php')
| -rw-r--r-- | settings/admin.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/settings/admin.php b/settings/admin.php index 56484f25b26..e8b1fef7b7a 100644 --- a/settings/admin.php +++ b/settings/admin.php @@ -56,11 +56,11 @@ $template->assign('forceSSLforSubdomainsEnabled', $config->getSystemValue('force // If the current web root is non-empty but the web root from the config is, // and system cron is used, the URL generator fails to build valid URLs. -$shouldSuggestOverwriteWebRoot = $config->getAppValue('core', 'backgroundjobs_mode', 'ajax') === 'cron' && +$shouldSuggestOverwriteCliUrl = $config->getAppValue('core', 'backgroundjobs_mode', 'ajax') === 'cron' && \OC::$WEBROOT && \OC::$WEBROOT !== '/' && - !$config->getSystemValue('overwritewebroot', ''); -$suggestedOverwriteWebRoot = ($shouldSuggestOverwriteWebRoot) ? \OC::$WEBROOT : ''; -$template->assign('suggestedOverwriteWebroot', $suggestedOverwriteWebRoot); + !$config->getSystemValue('overwrite.cli.url', ''); +$suggestedOverwriteCliUrl = ($shouldSuggestOverwriteCliUrl) ? \OC::$WEBROOT : ''; +$template->assign('suggestedOverwriteCliUrl', $suggestedOverwriteCliUrl); $template->assign('allowLinks', $appConfig->getValue('core', 'shareapi_allow_links', 'yes')); $template->assign('enforceLinkPassword', \OCP\Util::isPublicLinkPasswordRequired()); |