summaryrefslogtreecommitdiff
path: root/program/include/rcube_config.php
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-04-12 09:06:49 +0000
committeralecpl <alec@alec.pl>2011-04-12 09:06:49 +0000
commit23b49558cd5f70c351788a129042a62fe8170dfe (patch)
treef08cc25393752304ef307927379c5a00f642b19b /program/include/rcube_config.php
parentfc072bfdb38f3b6dccaf9c9c3c309b36e604d4e6 (diff)
- Fix handling of debug_level=4 in ajax requests (#1487831)
Diffstat (limited to 'program/include/rcube_config.php')
-rw-r--r--program/include/rcube_config.php9
1 files changed, 3 insertions, 6 deletions
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 5d176053e..31608a3cc 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -87,12 +87,9 @@ class rcube_config
ini_set('error_log', $this->prop['log_dir'].'/errors');
}
}
- if ($this->prop['debug_level'] & 4) {
- ini_set('display_errors', 1);
- }
- else {
- ini_set('display_errors', 0);
- }
+
+ // enable display_errors in 'show' level, but not for ajax requests
+ ini_set('display_errors', intval(empty($_REQUEST['_remote']) && ($this->prop['debug_level'] & 4)));
// export config data
$GLOBALS['CONFIG'] = &$this->prop;