- Fix handling of debug_level=4 in ajax requests (#1487831)

git-svn-id: https://svn.roundcube.net/trunk@4646 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 3 insertions, 6 deletions

diff --git a/roundcubemail/program/include/rcube_config.php b/roundcubemail/program/include/rcube_config.php
index 5d176053e..31608a3cc 100644
--- a/roundcubemail/program/include/rcube_config.php
+++ b/roundcubemail/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;