[Fmsystem-commits] [14832] hide error messages on display_errors off

[Sigurd Nes]

Revision: 14832
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14832
Author:   sigurdne
Date:     2016-03-14 12:37:51 +0000 (Mon, 14 Mar 2016)
Log Message:
-----------
hide error messages on display_errors off

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.log.inc.php

Modified: trunk/phpgwapi/inc/class.log.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.log.inc.php        2016-03-11 11:40:07 UTC (rev 
14831)
+++ trunk/phpgwapi/inc/class.log.inc.php        2016-03-14 12:37:51 UTC (rev 
14832)
@@ -280,13 +280,15 @@
                                }
 
 
-                               $message = '<h1>' . lang('Fatal Error') . 
"</h1>\n"
-                                       . "<h2>{$msg}</h2>\n"
+                               $message = '<h1>' . lang('Fatal Error') . 
"</h1>\n";
+                               if (ini_get('display_errors'))
+                               {
+                                       $message .= "<h2>{$msg}</h2>\n"
                                        . '<p>' . lang('file') . ': ' . 
$err->fname . "<br>\n"
                                        . lang('line') . ': ' . $err->line . 
"</p>\n"
                                        . $trace;
+                               }
 
-
                                if(phpgw::get_var('phpgw_return_as') == 'json')
                                {
                                        echo json_encode($message);