diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-30 22:52:14 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-30 22:52:14 +0200 |
| commit | ee8e5bcf371bc17ee4d65672658e4fe8ea377b07 (patch) | |
| tree | dcb05d359271cd10dbeb6a39e300a0d750afed1a /phpBB/cron.php | |
| parent | 64f81636525c72958e0a770f640b403386f12c68 (diff) | |
| parent | a6a2d1bc2d85157bdd1e79fd5c853b30eeccd02d (diff) | |
| download | forums-ee8e5bcf371bc17ee4d65672658e4fe8ea377b07.tar forums-ee8e5bcf371bc17ee4d65672658e4fe8ea377b07.tar.gz forums-ee8e5bcf371bc17ee4d65672658e4fe8ea377b07.tar.bz2 forums-ee8e5bcf371bc17ee4d65672658e4fe8ea377b07.tar.xz forums-ee8e5bcf371bc17ee4d65672658e4fe8ea377b07.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12597] Update USE_SYSTEM_CRON_EXPLAIN to be a bit more verbose.
[ticket/12597] Improve language for cron:run command.
[ticket/12597] Do not output anything besides the gif image.
Diffstat (limited to 'phpBB/cron.php')
| -rw-r--r-- | phpBB/cron.php | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/phpBB/cron.php b/phpBB/cron.php index 611d5d4aaf..8bb49bd5d2 100644 --- a/phpBB/cron.php +++ b/phpBB/cron.php @@ -41,8 +41,6 @@ function output_image() // the cron lock locked, especially when working on cron-related code. // // Attempt to alleviate the problem by doing setup outside of the lock as much as possible. -// -// If DEBUG is defined and cron lock cannot be obtained, a message will be printed. $cron_type = request_var('cron_type', ''); @@ -68,12 +66,4 @@ if ($cron_lock->acquire()) } } $cron_lock->release(); - -} -else -{ - if (defined('DEBUG')) - { - echo $user->lang('CRON_LOCK_ERROR') . "\n"; - } } |