From ff280d3f466dcb139af98b027317291e4ca45b2f Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Thu, 22 May 2014 12:11:02 +0200 Subject: [PATCH] [ticket/12576] Remove cron from common.php PHPBB3-12576 --- phpBB/common.php | 5 ----- phpBB/includes/functions.php | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/phpBB/common.php b/phpBB/common.php index 4ad669a021..d8375d365b 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -108,11 +108,6 @@ foreach ($phpbb_hook_finder->find() as $hook) @include($phpbb_root_path . 'includes/hooks/' . $hook . '.' . $phpEx); } -if (!$config['use_system_cron']) -{ - $cron = $phpbb_container->get('cron.manager'); -} - /** * Main event which is triggered on every page * diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 49568bb1b2..adb6e1a0a0 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -5116,7 +5116,8 @@ function page_footer($run_cron = true, $display_template = true, $exit_handler = // Call cron job? if ($call_cron) { - global $cron; + global $phpbb_container; + $cron = $phpbb_container->get('cron.manager'); $task = $cron->find_one_ready_task(); if ($task)