[Phpbb-checkins] r10082 - in /branches/phpBB-3_0_0/phpBB: docs/CHANGELOG.html includes/functions.php

[Meik S. <acy...@ph...>]

Author: acydburn
Date: Tue Sep  1 12:39:59 2009
New Revision: 10082

Log:
Only embed cron.php if there is no cron lock present to reduce overhead. (Bug #45725 - Patch by TerryE)

Modified:
    branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
    branches/phpBB-3_0_0/phpBB/includes/functions.php

Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Tue Sep  1 12:39:59 2009
***************
*** 203,208 ****
--- 203,209 ----
  		<li>[Fix] Only show &quot;Add friend&quot; and &quot;Add foe&quot; links if the specific module is enabled. (Bug #50475)</li>
  		<li>[Fix] Correctly display list items in forum description in prosilver and administration. (Bug #48055 - Patch by leviatan21)</li>
  		<li>[Fix] Fix handling of bookmarks and subscriptions on &quot;split topcis&quot;, &quot;merge topics&quot; and &quot;merge posts&quot;. (Bug #50035)</li>
+ 		<li>[Fix] Only embed cron.php if there is no cron lock present to reduce overhead. (Bug #45725 - Patch by TerryE)</li>
  		<li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</li>
  		<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
  		<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>

Modified: branches/phpBB-3_0_0/phpBB/includes/functions.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions.php Tue Sep  1 12:39:59 2009
***************
*** 4284,4291 ****
--- 4284,4310 ----
  	);
  
  	// Call cron-type script
+ 	$call_cron = false;
  	if (!defined('IN_CRON') && $run_cron && !$config['board_disable'])
  	{
+ 		$call_cron = true;
+ 
+ 		// Any old lock present?
+ 		if (!empty($config['cron_lock']))
+ 		{
+ 			$cron_time = explode(' ', $config['cron_lock']);
+ 
+ 			// If 1 hour lock is present we do not call cron.php
+ 			if ($cron_time[0] + 3600 >= time())
+ 			{
+ 				$call_cron = false;
+ 			}
+ 		}
+ 	}
+ 
+ 	// Call cron job?
+ 	if ($call_cron)
+ 	{
  		$cron_type = '';
  
  		if (time() - $config['queue_interval'] > $config['last_queue_run'] && !defined('IN_ADMIN') && file_exists($phpbb_root_path . 'cache/queue.' . $phpEx))