[Phpbb-checkins] r9924 - in /branches/phpBB-3_0_0/phpBB: includes/functions.php language/en/acp/common.php

[Henry S. <kel...@ph...>]

Author: Kellanved
Date: Wed Aug  5 13:02:18 2009
New Revision: 9924

Log:
log general errors in cron, images and when debug is enabled

Modified:
    branches/phpBB-3_0_0/phpBB/includes/functions.php
    branches/phpBB-3_0_0/phpBB/language/en/acp/common.php

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 Wed Aug  5 13:02:18 2009
***************
*** 3505,3510 ****
--- 3505,3518 ----
  					$l_notify = '<p>Please notify the board administrator or webmaster: <a href="mailto:' . $config['board_contact'] . '">' . $config['board_contact'] . '</a></p>';
  				}
  			}
+ 			
+ 			if (defined('DEBUG') || defined('IN_CRON') || defined('IMAGE_OUTPUT'))
+ 			{
+ 				// let's avoid loops
+ 				$db->sql_return_on_error(true);
+ 				add_log('critical', 'LOG_GENERAL_ERROR', $msg_title, $msg_text);
+ 				$db->sql_return_on_error(false);
+ 			}
  
  			garbage_collection();
  

Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/common.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/common.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/common.php Wed Aug  5 13:02:18 2009
***************
*** 562,567 ****
--- 562,569 ----
  	'LOG_FORUM_MOVE_UP'						=> '<strong>Moved forum</strong> %1$s <strong>above</strong> %2$s',
  	'LOG_FORUM_SYNC'						=> '<strong>Re-synchronised forum</strong><br />» %s',
  
+ 	'LOG_GENERAL_ERROR'	=> '<strong>A general error occured</strong>: %1$s <br />» %2$s',
+ 
  	'LOG_GROUP_CREATED'		=> '<strong>New usergroup created</strong><br />» %s',
  	'LOG_GROUP_DEFAULTS'	=> '<strong>Group “%1$s” made default for members</strong><br />» %2$s',
  	'LOG_GROUP_DELETE'		=> '<strong>Usergroup deleted</strong><br />» %s',