Fix incorrect warning about setting the overwrite.cli.url

diff --git a/settings/admin.php b/settings/admin.php
index 56484f25b26ba3851cdb868059dc811adeda47e9..e8b1fef7b7a750bb31188b9b8fd7e01ac12f6114 100644 (file)
--- 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());

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index d04351c2d6c0cc4ca2f230cdaf168a15adbed65b..f55626defb0857ebdc9f02c8cebe8253ca552aff 100644 (file)
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -178,13 +178,13 @@ if (!$_['isLocaleWorking']) {
 <?php
 }
 
-if ($_['suggestedOverwriteWebroot']) {
+if ($_['suggestedOverwriteCliUrl']) {
        ?>
        <div class="section">
                <h2><?php p($l->t('URL generation in notification emails'));?></h2>
 
                <span class="connectionwarning">
-               <?php p($l->t('If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the "overwritewebroot" option in your config.php file to the webroot path of your installation (Suggested: "%s")', $_['suggestedOverwriteWebroot'])); ?>
+               <?php p($l->t('If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the "overwrite.cli.url" option in your config.php file to the webroot path of your installation (Suggested: "%s")', $_['suggestedOverwriteCliUrl'])); ?>
        </span>
 
        </div>