From 7d39079e6f7dfd14da72c97600af4adb0562974e Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 15 Aug 2018 22:14:23 -0700
Subject: [PATCH] Upgrader - When updating message templates, identify them by
 name

Also: Fix a layout issue caused by a typo in the `<li>` tag.
---
 CRM/Upgrade/Incremental/General.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CRM/Upgrade/Incremental/General.php b/CRM/Upgrade/Incremental/General.php
index 3575ce91c9..5737fbd5e4 100644
--- a/CRM/Upgrade/Incremental/General.php
+++ b/CRM/Upgrade/Incremental/General.php
@@ -131,9 +131,13 @@ class CRM_Upgrade_Incremental_General {
     if (empty($messages)) {
       return;
     }
+    $messagesHtml = array_map(function($k, $v) {
+      return sprintf("<li><em>%s</em> - %s</li>", htmlentities($k), htmlentities($v));
+    }, array_keys($messages), $messages);
+
     $message .= '<br />' . ts("The default copies of the message templates listed below will be updated to handle new features or correct a problem. Your installation has customized versions of these message templates, and you will need to apply the updates manually after running this upgrade. <a href='%1' style='color:white; text-decoration:underline; font-weight:bold;' target='_blank'>Click here</a> for detailed instructions. %2", array(
         1 => 'http://wiki.civicrm.org/confluence/display/CRMDOC/Message+Templates#MessageTemplates-UpgradesandCustomizedSystemWorkflowTemplates',
-        2 => '<ul><l>' . implode('</li><li>', $messages) . '</li></ul>',
+        2 => '<ul>' . implode('', $messagesHtml) . '</ul>',
       ));
 
     $messageObj->updateTemplates();
-- 
2.25.1