aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2009-08-05 12:02:18 +0000
committerHenry Sudhof <kellanved@phpbb.com>2009-08-05 12:02:18 +0000
commit4e9ce7060edad3361db224996adb5a87bf083b69 (patch)
treec22c715067b126b78917b0f647898851f3757434 /phpBB/includes/functions.php
parentb6690e51f9a125380cea86f23138ab95db7b51da (diff)
downloadforums-4e9ce7060edad3361db224996adb5a87bf083b69.tar
forums-4e9ce7060edad3361db224996adb5a87bf083b69.tar.gz
forums-4e9ce7060edad3361db224996adb5a87bf083b69.tar.bz2
forums-4e9ce7060edad3361db224996adb5a87bf083b69.tar.xz
forums-4e9ce7060edad3361db224996adb5a87bf083b69.zip
log general errors in cron, images and when debug is enabled
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9924 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php8
1 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 13864848a8..e797b279c9 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3505,6 +3505,14 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
$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();