From 18b3bef6c335fd9b2852bca1873071d3f66a2135 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Sat, 1 Aug 2015 21:46:59 -0400 Subject: [PATCH] CRM-16478 - Tweak upgrade message --- CRM/Upgrade/Incremental/php/FourSeven.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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 .= '

' . 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)) . '

'; } - else { - $preUpgradeMessage .= '

' . ts('The custom fatal error template setting will be removed during the upgrade, but you are not currently using this option.') . '

'; - } - } } -- 2.25.1