X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FUpgrade%2FIncremental%2FLegacy.php;h=c0175dce1b246538da009c0077b1bfc5e72f8c28;hb=cef4ea3b219c978e13813d3d9b5d7f8ae5e8c513;hp=d27e6913b9053dc8cc23f9b8680b52fe611251ff;hpb=397d0aec7771968e6ad649229f9a72c9c0e9b12c;p=civicrm-core.git diff --git a/CRM/Upgrade/Incremental/Legacy.php b/CRM/Upgrade/Incremental/Legacy.php index d27e6913b9..c0175dce1b 100644 --- a/CRM/Upgrade/Incremental/Legacy.php +++ b/CRM/Upgrade/Incremental/Legacy.php @@ -3,7 +3,7 @@ +--------------------------------------------------------------------+ | CiviCRM version 4.6 | +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2014 | + | Copyright CiviCRM LLC (c) 2004-2015 | +--------------------------------------------------------------------+ | This file is a part of CiviCRM. | | | @@ -23,12 +23,12 @@ | GNU Affero General Public License or the licensing of CiviCRM, | | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ -*/ + */ /** * * @package CRM - * @copyright CiviCRM LLC (c) 2004-2014 + * @copyright CiviCRM LLC (c) 2004-2015 * $Id$ * */ @@ -40,9 +40,10 @@ class CRM_Upgrade_Incremental_Legacy { /** - * Compute any messages which should be displayed before upgrade + * Compute any messages which should be displayed before upgrade. * - * @param $preUpgradeMessage string, alterable + * @param string $preUpgradeMessage + * alterable. * @param $currentVer * @param $latestVer */ @@ -80,7 +81,10 @@ SELECT id version_compare($upgradeTo, '3.4.beta3') >= 0 ) { $config = CRM_Core_Config::singleton(); - $preUpgradeMessage .= '
' . ts("As per the related blog post, we are making contact names, addresses and mailings monolingual; the values entered for the default locale (%2) will be preserved and values for other locales removed.", array(1 => 'http://civicrm.org/blogs/shot/multilingual-civicrm-3440-making-some-fields-monolingual', 2 => $config->lcMessages)); + $preUpgradeMessage .= '
' . ts("As per the related blog post, we are making contact names, addresses and mailings monolingual; the values entered for the default locale (%2) will be preserved and values for other locales removed.", array( + 1 => 'http://civicrm.org/blogs/shot/multilingual-civicrm-3440-making-some-fields-monolingual', + 2 => $config->lcMessages, + )); } if (version_compare($currentVer, '3.4.6') == -1 && @@ -102,12 +106,13 @@ SELECT id if (file_exists($ofcFile)) { if (@unlink($ofcFile)) { $preUpgradeMessage .= '
' . ts('This system included an outdated, insecure script (%1). The file was automatically deleted.', array( - 1 => $ofcFile - )); - } else { + 1 => $ofcFile, + )); + } + else { $preUpgradeMessage .= '
' . ts('This system includes an outdated, insecure script (%1). Please delete it.', array( - 1 => $ofcFile - )); + 1 => $ofcFile, + )); } } @@ -156,9 +161,9 @@ SELECT id return; } - $html = NULL; + $html = NULL; $pathName = dirname(dirname(__FILE__)); - $flag = FALSE; + $flag = FALSE; foreach ($workflows as $workflow => $title) { $name = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_OptionValue', $workflow, @@ -196,15 +201,20 @@ SELECT id if ($flag == TRUE) { $html = "