diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-11-10 23:39:00 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-11-10 23:39:00 +0100 |
| commit | 847feb07e784ccbe646257553f1efba8c5032b7f (patch) | |
| tree | 78860eb01da03d27f2c7c0c016556de596967010 /phpBB/cron.php | |
| parent | f0cfae1f014e5defd373bac74b5d915fc3568c7a (diff) | |
| parent | bd37f7f6c04780819dfa8f81b2d761b91859fd67 (diff) | |
| download | forums-847feb07e784ccbe646257553f1efba8c5032b7f.tar forums-847feb07e784ccbe646257553f1efba8c5032b7f.tar.gz forums-847feb07e784ccbe646257553f1efba8c5032b7f.tar.bz2 forums-847feb07e784ccbe646257553f1efba8c5032b7f.tar.xz forums-847feb07e784ccbe646257553f1efba8c5032b7f.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11189' into develop
* EXreaction/ticket/11189:
[ticket/11189] Replace DEBUG_EXTRA with DEBUG
[ticket/11189] Always log critical errors when in cron or in image output
Diffstat (limited to 'phpBB/cron.php')
| -rw-r--r-- | phpBB/cron.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/cron.php b/phpBB/cron.php index 95d2f8f9b6..787183f689 100644 --- a/phpBB/cron.php +++ b/phpBB/cron.php @@ -39,7 +39,7 @@ function do_cron($cron_lock, $run_tasks) foreach ($run_tasks as $task) { - if (defined('DEBUG_EXTRA') && $config['use_system_cron']) + if (defined('DEBUG') && $config['use_system_cron']) { echo "[phpBB cron] Running task '{$task->get_name()}'\n"; } @@ -57,7 +57,7 @@ function do_cron($cron_lock, $run_tasks) // // Attempt to alleviate the problem by doing setup outside of the lock as much as possible. // -// If DEBUG_EXTRA is defined and cron lock cannot be obtained, a message will be printed. +// If DEBUG is defined and cron lock cannot be obtained, a message will be printed. if ($config['use_system_cron']) { @@ -100,7 +100,7 @@ if ($cron_lock->acquire()) } else { - if (defined('DEBUG_EXTRA')) + if (defined('DEBUG')) { echo "Could not obtain cron lock.\n"; } |