enotice fixes in fatal error template

civicrm · Sep 27, 2021 · b7dd5ef · b7dd5ef
1 parent b1fc671
commit b7dd5ef
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/templates/CRM/common/fatal.tpl b/templates/CRM/common/fatal.tpl
@@ -13,7 +13,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 
 <head>
-  <title>{$pageTitle|escape}</title>
+  <title>{if !empty($pageTitle)}{$pageTitle|escape}{/if}</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <base href="{$config->resourceBase}" />
   <style type="text/css" media="screen">
@@ -35,23 +35,23 @@
 <div class="messages status no-popup">  <i class="crm-i fa-exclamation-triangle crm-i-red" aria-hidden="true"></i>
  <span class="status-fatal">{ts}Sorry, due to an error, we are unable to fulfill your request at the moment. You may want to contact your administrator or service provider with more details about what action you were performing when this occurred.{/ts}</span>
     <div class="crm-section crm-error-message">{$message|escape}</div>
-    {if $error.message && $message != $error.message}
+    {if !empty($error.message) && $message != $error.message}
         <hr style="solid 1px" />
         <div class="crm-section crm-error-message">{$error.message|escape}</div>
     {/if}
-    {if ($code OR $mysql_code OR $errorDetails) AND $config->debug}
+    {if (!empty($code) || !empty($mysql_code) || !empty($errorDetails)) AND $config->debug}
         <div class="crm-accordion-wrapper collapsed crm-fatal-error-details-block">
          <div class="crm-accordion-header" onclick="toggle(this);";>
           {ts}Error Details{/ts}
          </div><!-- /.crm-accordion-header -->
          <div class="crm-accordion-body">
-            {if $code}
+            {if !empty($code)}
                 <div class="crm-section">{ts}Error Code:{/ts} {$code|purify}</div>
             {/if}
-            {if $mysql_code}
+            {if !empty($mysql_code)}
                 <div class="crm-section">{ts}Database Error Code:{/ts} {$mysql_code|purify}</div>
             {/if}
-            {if $errorDetails}
+            {if !empty($errorDetails)}
                 <div class="crm-section">{ts}Additional Details:{/ts} {$errorDetails|purify}</div>
             {/if}
          </div><!-- /.crm-accordion-body -->