diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-05-08 03:21:19 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-05-08 03:21:19 -0400 |
| commit | ab44fe5e394fe7b69c57266e2934200a3ee9bbc5 (patch) | |
| tree | e6021c19fa15800787b1a7459fb8ad40cf2d8391 /phpBB/cron.php | |
| parent | 9c6660a2253149baff0094b943823de6758b35a6 (diff) | |
| parent | c0336988155736583c6fc4398980bd2a4e4036b6 (diff) | |
| download | forums-ab44fe5e394fe7b69c57266e2934200a3ee9bbc5.tar forums-ab44fe5e394fe7b69c57266e2934200a3ee9bbc5.tar.gz forums-ab44fe5e394fe7b69c57266e2934200a3ee9bbc5.tar.bz2 forums-ab44fe5e394fe7b69c57266e2934200a3ee9bbc5.tar.xz forums-ab44fe5e394fe7b69c57266e2934200a3ee9bbc5.zip | |
Merge branch 'develop' into feature/prune-users
* develop: (170 commits)
[ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined.
[feature/attachment-management-no-reassignment] Handle privacy and some more.
[ticket/10148] Turn TEMPLATE_BITFIELD into an instance variable.
[ticket/10147] Corrected a typo in includes/functions_template.php.
[ticket/10141] Save a hash lookup when value is not in cache.
[ticket/10143] Added tests for storing a previously deleted value in db cache.
[ticket/10105] Update AIM express link.
[ticket/10105] Update AIM application download link.
[ticket/10137] Remove unintended space at end of PHP_URL_FOPEN_SUPPORT_EXPLAIN.
[ticket/10141] Split double-assignment into conditional and unconditional part.
[ticket/10141] Use a cache in $auth->_fill_acl() for better performance.
[ticket/9961] Create log entries when users are activated.
[ticket/10139] Make signatures of set_atomic() consistent by using $new_value.
[ticket/10139] Rename $cache to $use_cache to avoid confusion with cache object
[ticket/10006] Remove unneeded if statements
[ticket/10006] Remove return values
[ticket/10006] More testing
[ticket/10006] Tweak the tests a bit
[ticket/10006] Add phpbb_config::delete
[ticket/7941] Added @return to generate_board_url docstring.
...
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 { |