diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-03-12 15:07:31 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-03-12 15:07:31 +0100 |
| commit | a627133b15aac20703d5fe82a7f1388225b6b00e (patch) | |
| tree | a4972139f4132d675008476390f86749000c33c2 /phpBB/cron.php | |
| parent | df096b6b52f9198561d689b505a8c74a0d0f86b6 (diff) | |
| download | forums-a627133b15aac20703d5fe82a7f1388225b6b00e.tar forums-a627133b15aac20703d5fe82a7f1388225b6b00e.tar.gz forums-a627133b15aac20703d5fe82a7f1388225b6b00e.tar.bz2 forums-a627133b15aac20703d5fe82a7f1388225b6b00e.tar.xz forums-a627133b15aac20703d5fe82a7f1388225b6b00e.zip | |
[ticket/10046] Remove register_shutdown_function() in cron.php from develop.
PHPBB3-10046
Diffstat (limited to 'phpBB/cron.php')
| -rw-r--r-- | phpBB/cron.php | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/phpBB/cron.php b/phpBB/cron.php index 6de493f0bf..cc5964218a 100644 --- a/phpBB/cron.php +++ b/phpBB/cron.php @@ -62,14 +62,11 @@ function do_cron($cron_lock, $run_tasks) if ($config['use_system_cron']) { - $use_shutdown_function = false; - $cron = new phpbb_cron_manager($phpbb_root_path . 'includes/cron/task', $phpEx, $cache->get_driver()); } else { $cron_type = request_var('cron_type', ''); - $use_shutdown_function = (@function_exists('register_shutdown_function')) ? true : false; // Comment this line out for debugging so the page does not return an image. output_image(); @@ -95,22 +92,12 @@ if ($cron_lock->acquire()) } if ($task->is_ready()) { - if ($use_shutdown_function && !$task->is_shutdown_function_safe()) - { - $use_shutdown_function = false; - } $run_tasks = array($task); } } } - if ($use_shutdown_function) - { - register_shutdown_function('do_cron', $cron_lock, $run_tasks); - } - else - { - do_cron($cron_lock, $run_tasks); - } + + do_cron($cron_lock, $run_tasks); } else { |