aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/cron.php
diff options
context:
space:
mode:
authorNathaniel Guse <nathaniel.guse@gmail.com>2012-11-11 04:42:06 -0600
committerNathaniel Guse <nathaniel.guse@gmail.com>2012-11-11 04:42:06 -0600
commit84ba10ec8c023ab307eb7d0b829ab337aaaae78e (patch)
tree468abf9fbb513cba53803ca29c6b65fd4ea497ec /phpBB/cron.php
parent106daa09ebb5b12bf9892c41f8c1de627cf6b0e9 (diff)
parente86ecc0f3bd6383d31a670896720a970b8faaaa9 (diff)
downloadforums-84ba10ec8c023ab307eb7d0b829ab337aaaae78e.tar
forums-84ba10ec8c023ab307eb7d0b829ab337aaaae78e.tar.gz
forums-84ba10ec8c023ab307eb7d0b829ab337aaaae78e.tar.bz2
forums-84ba10ec8c023ab307eb7d0b829ab337aaaae78e.tar.xz
forums-84ba10ec8c023ab307eb7d0b829ab337aaaae78e.zip
Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103
Diffstat (limited to 'phpBB/cron.php')
-rw-r--r--phpBB/cron.php6
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";
}