From b7dd5ef784f321ec5dea652a613b173cbcee9fc3 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Mon, 27 Sep 2021 18:34:53 +1300
Subject: [PATCH] enotice fixes in fatal error template

---
 templates/CRM/common/fatal.tpl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/templates/CRM/common/fatal.tpl b/templates/CRM/common/fatal.tpl
index 870180bb0a22..4ee6936607a5 100644
--- 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 -->
