From 834aba230968be7238c73861e2599659053b7e17 Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Fri, 3 Jul 2020 09:04:05 +0800 Subject: [PATCH] MDL-68714 cron: Check value of CLI_SCRIPT not existence --- lib/clilib.php | 2 +- lib/cronlib.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/clilib.php b/lib/clilib.php index 1495aedab9e..1295e54e800 100644 --- a/lib/clilib.php +++ b/lib/clilib.php @@ -154,7 +154,7 @@ function cli_get_params(array $longoptions, array $shortmapping=null) { * @param string $suffix process suffix */ function cli_set_process_title_suffix(string $suffix) { - if (defined('CLI_SCRIPT') && isset($_SERVER['argv'])) { + if (CLI_SCRIPT && isset($_SERVER['argv'])) { $command = join(' ', $_SERVER['argv']); @cli_set_process_title("php $command ($suffix)"); } diff --git a/lib/cronlib.php b/lib/cronlib.php index 919043d4e2f..74a83d5b1d7 100644 --- a/lib/cronlib.php +++ b/lib/cronlib.php @@ -383,7 +383,7 @@ function cron_run_inner_adhoc_task(\core\task\adhoc_task $task) { */ function cron_set_process_title(string $title) { global $CFG; - if (defined('CLI_SCRIPT')) { + if (CLI_SCRIPT) { require_once($CFG->libdir . '/clilib.php'); $datetime = userdate(time(), '%b %d, %H:%M:%S'); cli_set_process_title_suffix("$datetime $title");