CRM-16478 - Tweak upgrade message

diff --git a/CRM/Upgrade/Incremental/php/FourSeven.php b/CRM/Upgrade/Incremental/php/FourSeven.php
index cf30494a6d956740d05ea66ecd63dd5e43faedb2..71adbb4127c394b249a1beb8bcdb7a6129a45825 100644 (file)
--- 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>';
-      }
-
     }
   }