Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CRM-20941 - Display correct version number in upgrade message #10948

Merged
merged 2 commits into from
Sep 6, 2017
Merged

CRM-20941 - Display correct version number in upgrade message #10948

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1d838e
CRM-20941 - Display correct version number in upgrade message
colemanw Sep 6, 2017
2179c94
CRM-20941 - Add punctuation to the end of sentences.
colemanw Sep 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CRM/Upgrade/Incremental/General.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ public static function setPreUpgradeMessage(&$preUpgradeMessage, $currentVer, $l
$preUpgradeMessage .= '<p>';
// CRM-20941 PHP 5.3 end date of End of 2017, PHP 5.4 End date End of Feb 2018 Recommend anyone on PHP 5.5 to move up to 5.6 or later e.g. 7.0
if (version_compare(phpversion(), self::PREVIOUS_MIN_RECOMMENDED_PHP_VER) >= 0) {
$preUpgradeMessage .= ts('You may proceed with the upgrade and CiviCRM %1 will continue working normally, but future releases will require PHP %2 or above. We recommend you use the most recent php version you can', array(
1 => $currentVer,
$preUpgradeMessage .= ts('You may proceed with the upgrade and CiviCRM %1 will continue working normally, but future releases will require PHP %2 or above. We recommend you use the most recent php version you can.', array(
1 => $latestVer,
2 => self::MIN_RECOMMENDED_PHP_VER,
));
}
Expand All @@ -85,7 +85,7 @@ public static function setPreUpgradeMessage(&$preUpgradeMessage, $currentVer, $l
if (version_compare(phpversion(), 5.4) < 0) {
$date = CRM_Utils_Date::customFormat('2017-12-31', $dateFormat);
}
$preUpgradeMessage .= ts('You may proceed with the upgrade and CiviCRM %1 will continue working normally, but PHP %2 will not work in releases published after %3. We recommend you use the most recent php version you can. For more explanation see <a href="%4">the announcement</a>', array(
$preUpgradeMessage .= ts('You may proceed with the upgrade and CiviCRM %1 will continue working normally, but PHP %2 will not work in releases published after %3. We recommend you use the most recent php version you can. For more explanation see <a href="%4">the announcement</a>.', array(
1 => $currentVer,
2 => phpversion(),
3 => $date,
Expand Down