aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2009-08-04 15:34:04 +0000
committerHenry Sudhof <kellanved@phpbb.com>2009-08-04 15:34:04 +0000
commitccbbaba91d0314144932c2916229818b0ac71c4e (patch)
tree584457b4e8c3eac52a80256d19df6420e9578a11
parent6cd6a907c7d8503896a46f710bb75370f1abcf43 (diff)
downloadforums-ccbbaba91d0314144932c2916229818b0ac71c4e.tar
forums-ccbbaba91d0314144932c2916229818b0ac71c4e.tar.gz
forums-ccbbaba91d0314144932c2916229818b0ac71c4e.tar.bz2
forums-ccbbaba91d0314144932c2916229818b0ac71c4e.tar.xz
forums-ccbbaba91d0314144932c2916229818b0ac71c4e.zip
add the option to place image debugging information to the log
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9920 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/functions.php7
-rw-r--r--phpBB/language/en/acp/common.php2
2 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index d147872c34..6549ba9b0d 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3465,8 +3465,13 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
// remove complete path to installation, with the risk of changing backslashes meant to be there
$errfile = str_replace(array(phpbb_realpath($phpbb_root_path), '\\'), array('', '/'), $errfile);
$msg_text = str_replace(array(phpbb_realpath($phpbb_root_path), '\\'), array('', '/'), $msg_text);
-
echo '<b>[phpBB Debug] PHP Notice</b>: in file <b>' . $errfile . '</b> on line <b>' . $errline . '</b>: <b>' . $msg_text . '</b><br />' . "\n";
+
+ // we are writing an image - the user won't see the debug, so let's place it in the log
+ if (defined('IMAGE_OUTPUT'))
+ {
+ add_log('critical', 'LOG_IMAGE_GENERATION_ERROR', $errfile, $errline, $msg_text);
+ }
// echo '<br /><br />BACKTRACE<br />' . get_backtrace() . '<br />' . "\n";
}
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 9a9b89652a..f03298642a 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -574,6 +574,8 @@ $lang = array_merge($lang, array(
'LOG_USERS_APPROVED' => '<strong>Users approved in usergroup</strong> %1$s<br />» %2$s',
'LOG_USERS_PENDING' => '<strong>Users requested to join group “%1$s” and need to be approved</strong><br />» %2$s',
+ 'LOG_IMAGE_GENERATION_ERROR' => '<strong>Error while creating image</strong><br />» Error in %1$s on line %2$s: %3$s',
+
'LOG_IMAGESET_ADD_DB' => '<strong>Added new imageset to database</strong><br />» %s',
'LOG_IMAGESET_ADD_FS' => '<strong>Add new imageset on filesystem</strong><br />» %s',
'LOG_IMAGESET_DELETE' => '<strong>Deleted imageset</strong><br />» %s',