L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-68946' of https://github.com/Chocolate-lightning/moodle

Browse Source
This commit is contained in:
Andrew Nicols
2020-06-09 11:48:00 +08:00
parent ea9a854bb6 329d3a8de5
commit c8c1bccf08
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/task/classes/check/cronrunning.php
+11 -3
View File
@@ -81,9 +81,17 @@ class cronrunning extends check {
}
if (empty($lastcron)) {
$summary = get_string('cronwarningnever', 'admin', [
'expected' => $formatexpected,
]);
if (empty($CFG->cronclionly)) {
$url = new \moodle_url('/admin/cron.php');
$summary = get_string('cronwarningneverweb', 'admin', [
'url' => $url->out(),
'expected' => $formatexpected,
]);
} else {
$summary = get_string('cronwarningnever', 'admin', [
'expected' => $formatexpected,
]);
}
} else if (empty($CFG->cronclionly)) {
$url = new \moodle_url('/admin/cron.php');
$summary = get_string('cronwarning', 'admin', [
lang/en/admin.php
+1
View File
@@ -433,6 +433,7 @@ $string['cronremotepassword'] = 'Cron password for remote access';
$string['cronwarning'] = 'The <a href="{$a->url}">admin/cron.php script</a> has not been run for {$a->actual} and should run every {$a->expected}.';
$string['cronwarningcli'] = 'The <code>admin/cli/cron.php</code> script has not been run for {$a->actual} and should run every {$a->expected}.';
$string['cronwarningnever'] = 'The <code>admin/cli/cron.php</code> script has never been run and should run every {$a->expected}.';
$string['cronwarningneverweb'] = 'The <a href="{$a->url}">admin/cron.php script</a> script has never been run and should run every {$a->expected}.';
$string['ctyperequired'] = 'The ctype PHP extension is now required by Moodle, in order to improve site performance and to offer multilingual compatibility.';
$string['curlsecurityallowedport'] = 'cURL allowed ports list';
$string['curlsecurityallowedportsyntax'] = 'List of port numbers that cURL can connect to. Valid entries are integer numbers only. Put each entry on a new line. If left empty, then all ports are allowed. If set, in almost all cases, both 443 and 80 should be specified for cURL to connect to standard HTTPS and HTTP ports.';