aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-05-18 14:33:18 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-05-18 14:33:18 +0000
commit1dc89ca465fbe005421b6248569b322489c8701f (patch)
tree41d23d2f336c044398234b67a195c213ea2dbbf3 /phpBB
parent41aae48ad371c3044d1d355f2380735bd45cba92 (diff)
downloadforums-1dc89ca465fbe005421b6248569b322489c8701f.tar
forums-1dc89ca465fbe005421b6248569b322489c8701f.tar.gz
forums-1dc89ca465fbe005421b6248569b322489c8701f.tar.bz2
forums-1dc89ca465fbe005421b6248569b322489c8701f.tar.xz
forums-1dc89ca465fbe005421b6248569b322489c8701f.zip
Disable DEBUG by default, enable backtrace by default
git-svn-id: file:///svn/phpbb/trunk@7631 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/functions_messenger.php10
-rwxr-xr-xphpBB/install/install_install.php2
2 files changed, 5 insertions, 7 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 2dc40bfdc3..d4052a8968 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -956,11 +956,9 @@ class smtp_class
function smtp_class()
{
- if (defined('DEBUG'))
- {
- $this->backtrace = true;
- $this->backtrace_log = array();
- }
+ // Always create a backtrace for admins to identify SMTP problems
+ $this->backtrace = true;
+ $this->backtrace_log = array();
}
/**
@@ -970,7 +968,7 @@ class smtp_class
{
if ($this->backtrace)
{
- $this->backtrace_log[] = htmlspecialchars($message, ENT_COMPAT, 'UTF-8');
+ $this->backtrace_log[] = utf8_htmlspecialchars($message);
}
}
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 9635036dee..5eecbeea33 100755
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -908,7 +908,7 @@ class install_install extends module
$config_data .= "\$acm_type = 'file';\n";
$config_data .= "\$load_extensions = '$load_extensions';\n\n";
$config_data .= "@define('PHPBB_INSTALLED', true);\n";
- $config_data .= "@define('DEBUG', true);\n"; // @todo Comment out when final
+ $config_data .= "// @define('DEBUG', true);\n";
$config_data .= "// @define('DEBUG_EXTRA', true);\n";
$config_data .= '?' . '>'; // Done this to prevent highlighting editors getting confused!