From: Tim Otten <totten@civicrm.org> Date: Wed, 21 Feb 2018 23:57:15 +0000 (-0800) Subject: /civicrm/upgrade - On finish screen, display actual version number X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a343bebf0acc012a68959acad3df6271698f0e4c;p=civicrm-core.git /civicrm/upgrade - On finish screen, display actual version number This screen was hard-coded to always display the message "Thank you for upgrading to 4.7...". This patch makes it dynamic, plugging in the actual version number. --- diff --git a/CRM/Upgrade/Page/Upgrade.php b/CRM/Upgrade/Page/Upgrade.php index d9d1037bb5..7dc6e112ef 100644 --- a/CRM/Upgrade/Page/Upgrade.php +++ b/CRM/Upgrade/Page/Upgrade.php @@ -194,6 +194,7 @@ class CRM_Upgrade_Page_Upgrade extends CRM_Core_Page { $template->assign('message', $postUpgradeMessage); $template->assign('upgraded', TRUE); $template->assign('sid', CRM_Utils_System::getSiteID()); + $template->assign('newVersion', $latestVer); // Render page header if (!defined('CIVICRM_UF_HEAD') && $region = CRM_Core_Region::instance('html-header', FALSE)) { diff --git a/templates/CRM/common/success.tpl b/templates/CRM/common/success.tpl index 81c8d895dc..5b0b63a359 100644 --- a/templates/CRM/common/success.tpl +++ b/templates/CRM/common/success.tpl @@ -61,7 +61,7 @@ <div class="bold" style="padding: 1em; background-color: rgba(255, 255, 255, 0.76);"> <p> <img style="display:block; float:left; width:40px; margin-right:10px;" src="{$config->resourceBase}i/logo_lg.png"> - {ts 1="https://civicrm.org/core-team" 2="https://civicrm.org/providers/contributors" 3="https://civicrm.org/become-a-member?src=ug&sid=$sid"}Thank you for upgrading to 4.7, the latest version of CiviCRM. Packed with new features and improvements, this release was made possible by both the <a href="%1">CiviCRM Core Team</a> and an incredible group of <a href="%2">contributors</a>, combined with the financial support of CiviCRM Members and Partners, without whom the project could not exist. We invite you to join their ranks by <a href="%3">becoming a member of CiviCRM today</a>. There is no better way to say thanks than to support those that have made CiviCRM 4.7 possible. <a href="%3">Join today</a>.{/ts} + {ts 1="https://civicrm.org/core-team" 2="https://civicrm.org/providers/contributors" 3="https://civicrm.org/become-a-member?src=ug&sid=$sid" 4=$newVersion}Thank you for upgrading to %4, the latest version of CiviCRM. Packed with new features and improvements, this release was made possible by both the <a href="%1">CiviCRM Core Team</a> and an incredible group of <a href="%2">contributors</a>, combined with the financial support of CiviCRM Members and Partners, without whom the project could not exist. We invite you to join their ranks by <a href="%3">becoming a member of CiviCRM today</a>. There is no better way to say thanks than to support those that have made CiviCRM %4 possible. <a href="%3">Join today</a>.{/ts} </p> </div> <p><span class="crm-status-icon success"> </span>{$message}</p>