Fixed msg_dialog.

Hide trace, if there is no trace available

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7925 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/ihtml/themes/default/msg_dialog.tpl b/ihtml/themes/default/msg_dialog.tpl
index d7d9ac49bc6048fc1e1efff3fe7521dd97949f3e..9d7fb391bdb9484853086fa412667ae2f8eccccc 100644 (file)
--- a/ihtml/themes/default/msg_dialog.tpl
+++ b/ihtml/themes/default/msg_dialog.tpl
@@ -91,7 +91,7 @@
 
        {else}
 
-               {if $s_Trace != ""}
+               {if $s_Trace != "" && $i_TraceCnt != 0}
                <div id='trace_{$i_ID}' style='visibility:hidden;'>
                        {$s_Trace}
                </div>
@@ -126,7 +126,7 @@
                                                <br>
                                                <br>
                                        </td>
-                                       {if $s_Trace}
+                                       {if $s_Trace != "" && $i_TraceCnt != 0}
                                        <td style='width:20px; vertical-align:top; cursor:pointer;'>
                                                <div onClick="toggle('trace_{$i_ID}')"><u>Trace</u></div>
                                        </td>

diff --git a/include/class_msg_dialog.inc b/include/class_msg_dialog.inc
index 349d56bb00752802fd8b2ac3920bc6af4b576408..538dc152a35d300aed29bcbb2f28c71c54d1ad5f 100644 (file)
--- a/include/class_msg_dialog.inc
+++ b/include/class_msg_dialog.inc
@@ -43,7 +43,7 @@ class msg_dialog
                        if(     isset($config) && 
                                is_object($config) && 
                                isset($config->data['MAIN']['DISPLAYERRORS']) &&
-                               !preg_match("/^true$/i",$config->data['MAIN']['DISPLAYERRORS'])){
+                               preg_match("/^true$/i",$config->data['MAIN']['DISPLAYERRORS'])){
                                $this->a_Trace   = debug_backtrace();
                        }
                        if(!isset($_SESSION['msg_dialogs'])){
@@ -91,7 +91,8 @@ class msg_dialog
                }else{
 
                        $smarty = get_smarty();
-                       $smarty->assign("s_Trace",print_a($this->a_Trace,TRUE));
+                       $smarty->assign("s_Trace"       ,print_a($this->a_Trace,TRUE));
+                       $smarty->assign("i_TraceCnt",count($this->a_Trace));
                        $smarty->assign("i_Type",$this->i_Type);
                        $smarty->assign("s_Message",$this->s_Message);
                        $smarty->assign("s_Title",$this->s_Title);