makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Save some calls here, since page_footer(true) gets called quite often.

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10087 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Andreas Fischer 2009-09-01 18:37:51 +00:00
parent 9d3a851ab5
commit 6134b641e3
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
phpBB/includes/functions.php
View file

@ -4288,6 +4288,7 @@ function page_footer($run_cron = true)
if (!defined('IN_CRON') && $run_cron && !$config['board_disable']) if (!defined('IN_CRON') && $run_cron && !$config['board_disable'])
{ {
$call_cron = true; $call_cron = true;
$time_now = (!empty($user->time_now) && is_int($user->time_now)) ? $user->time_now : time();
// Any old lock present? // Any old lock present?
if (!empty($config['cron_lock'])) if (!empty($config['cron_lock']))
@ -4295,7 +4296,7 @@ function page_footer($run_cron = true)
$cron_time = explode(' ', $config['cron_lock']); $cron_time = explode(' ', $config['cron_lock']);
// If 1 hour lock is present we do not call cron.php // If 1 hour lock is present we do not call cron.php
if ($cron_time[0] + 3600 >= time()) if ($cron_time[0] + 3600 >= $time_now)
{ {
$call_cron = false; $call_cron = false;
} }
@ -4307,31 +4308,31 @@ function page_footer($run_cron = true)
{ {
$cron_type = ''; $cron_type = '';
if (time() - $config['queue_interval'] > $config['last_queue_run'] && !defined('IN_ADMIN') && file_exists($phpbb_root_path . 'cache/queue.' . $phpEx)) if ($time_now - $config['queue_interval'] > $config['last_queue_run'] && !defined('IN_ADMIN') && file_exists($phpbb_root_path . 'cache/queue.' . $phpEx))
{ {
// Process email queue // Process email queue
$cron_type = 'queue'; $cron_type = 'queue';
} }
else if (method_exists($cache, 'tidy') && time() - $config['cache_gc'] > $config['cache_last_gc']) else if (method_exists($cache, 'tidy') && $time_now - $config['cache_gc'] > $config['cache_last_gc'])
{ {
// Tidy the cache // Tidy the cache
$cron_type = 'tidy_cache'; $cron_type = 'tidy_cache';
} }
else if ($config['warnings_expire_days'] && (time() - $config['warnings_gc'] > $config['warnings_last_gc'])) else if ($config['warnings_expire_days'] && ($time_now - $config['warnings_gc'] > $config['warnings_last_gc']))
{ {
$cron_type = 'tidy_warnings'; $cron_type = 'tidy_warnings';
} }
else if (time() - $config['database_gc'] > $config['database_last_gc']) else if ($time_now - $config['database_gc'] > $config['database_last_gc'])
{ {
// Tidy the database // Tidy the database
$cron_type = 'tidy_database'; $cron_type = 'tidy_database';
} }
else if (time() - $config['search_gc'] > $config['search_last_gc']) else if ($time_now - $config['search_gc'] > $config['search_last_gc'])
{ {
// Tidy the search // Tidy the search
$cron_type = 'tidy_search'; $cron_type = 'tidy_search';
} }
else if (time() - $config['session_gc'] > $config['session_last_gc']) else if ($time_now - $config['session_gc'] > $config['session_last_gc'])
{ {
$cron_type = 'tidy_sessions'; $cron_type = 'tidy_sessions';
} }