summaryrefslogtreecommitdiffstats
path: root/settings/admin.php
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2015-02-27 20:04:52 +0100
committerLukas Reschke <lukas@owncloud.com>2015-02-27 20:20:34 +0100
commitb6d8a48ce1cefdd11db90d7a4b359f22b2906962 (patch)
tree97d515ceca808a54c932fc9d873488931ede4fc7 /settings/admin.php
parent13b0b7dfaf6553411928677420d8d21fa352bb3e (diff)
downloadnextcloud-server-b6d8a48ce1cefdd11db90d7a4b359f22b2906962.tar.gz
nextcloud-server-b6d8a48ce1cefdd11db90d7a4b359f22b2906962.zip
Add detection for invalid CLI configuration for settings page
This change will log all failures that prevent the CLI cronjob from happening to the database and display a warning to administrators when an error happened. To test: 1. Configure some invalid CLI php.ini settings 2. Enable the CLI cronjob and run php cron.php 3. See the errors printed and also in the admin page 4. Configure the CLI settings correctly 5. Errors should be gone. Fixes https://github.com/owncloud/core/issues/13994
Diffstat (limited to 'settings/admin.php')
-rw-r--r--settings/admin.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/settings/admin.php b/settings/admin.php
index 7c7ca4cada7..95940db7282 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -80,6 +80,7 @@ $template->assign('allowMailNotification', $appConfig->getValue('core', 'shareap
$template->assign('onlyShareWithGroupMembers', \OC\Share\Share::shareWithGroupMembersOnly());
$databaseOverload = (strpos(\OCP\Config::getSystemValue('dbtype'), 'sqlite') !== false);
$template->assign('databaseOverload', $databaseOverload);
+$template->assign('cronErrors', $appConfig->getValue('core', 'cronErrors'));
// warn if Windows is used
$template->assign('WindowsWarning', OC_Util::runningOnWindows());