Merge pull request #12775 from eileenmcnaughton/cancel

[civicrm-core.git] / CRM / Upgrade / Incremental / General.php

diff --git a/CRM/Upgrade/Incremental/General.php b/CRM/Upgrade/Incremental/General.php
index 3575ce91c9aa66407d601bbdb33938abe8c89eec..6b0ed69819312e41fb6f6a70f07657f1dae4e6a7 100644 (file)
--- a/CRM/Upgrade/Incremental/General.php
+++ b/CRM/Upgrade/Incremental/General.php
@@ -41,12 +41,12 @@ class CRM_Upgrade_Incremental_General {
   /**
    * The recommended PHP version.
    */
-  const RECOMMENDED_PHP_VER = '7.0';
+  const RECOMMENDED_PHP_VER = '7.1';
 
   /**
    * The previous recommended PHP version.
    */
-  const MIN_RECOMMENDED_PHP_VER = '5.6';
+  const MIN_RECOMMENDED_PHP_VER = '7.0';
 
   /**
    * The minimum PHP version required to install Civi.
@@ -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();