From: Coleman Watts <coleman@civicrm.org>
Date: Sun, 2 Aug 2015 01:46:59 +0000 (-0400)
Subject: CRM-16478 - Tweak upgrade message
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=18b3bef6c335fd9b2852bca1873071d3f66a2135;p=civicrm-core.git

CRM-16478 - Tweak upgrade message
---

diff --git a/CRM/Upgrade/Incremental/php/FourSeven.php b/CRM/Upgrade/Incremental/php/FourSeven.php
index cf30494a6d..71adbb4127 100644
--- a/CRM/Upgrade/Incremental/php/FourSeven.php
+++ b/CRM/Upgrade/Incremental/php/FourSeven.php
@@ -47,13 +47,9 @@ class CRM_Upgrade_Incremental_php_FourSeven extends CRM_Upgrade_Incremental_Base
 
       // CRM-16478 Remove custom fatal error template path option
       $config = CRM_Core_Config::singleton();
-      if ($config->fatalErrorTemplate != 'CRM/common/fatal.tpl') {
+      if (!empty($config->fatalErrorTemplate) && $config->fatalErrorTemplate != 'CRM/common/fatal.tpl') {
         $preUpgradeMessage .= '<p>' . ts('The custom fatal error template setting will be removed during the upgrade. You are currently using this custom template: %1 . Following the upgrade you will need to use the standard approach to overriding template files, as described in the documentation.', array(1 => $config->fatalErrorTemplate)) . '</p>';
       }
-      else {
-        $preUpgradeMessage .= '<p>' . ts('The custom fatal error template setting will be removed during the upgrade, but you are not currently using this option.') . '</p>';
-      }
-
     }
   }