From 291b0d15a971701eaa3f54c868538e3bfd89a990 Mon Sep 17 00:00:00 2001 From: CiviCRM Date: Thu, 5 Apr 2018 06:57:04 +0000 Subject: [PATCH] Set version to 5.2.alpha1 --- CRM/Upgrade/Incremental/php/FiveTwo.php | 87 +++++++++++++++++++ .../Incremental/sql/5.2.alpha1.mysql.tpl | 1 + sql/civicrm_generated.mysql | 2 +- xml/version.xml | 2 +- 4 files changed, 90 insertions(+), 2 deletions(-) create mode 100644 CRM/Upgrade/Incremental/php/FiveTwo.php create mode 100644 CRM/Upgrade/Incremental/sql/5.2.alpha1.mysql.tpl diff --git a/CRM/Upgrade/Incremental/php/FiveTwo.php b/CRM/Upgrade/Incremental/php/FiveTwo.php new file mode 100644 index 0000000000..b4f14e452f --- /dev/null +++ b/CRM/Upgrade/Incremental/php/FiveTwo.php @@ -0,0 +1,87 @@ +' . ts('A new permission has been added called %1 This Permission is now used to control access to the Manage Tags screen', array(1 => 'manage tags')) . '

'; + // } + } + + /** + * Compute any messages which should be displayed after upgrade. + * + * @param string $postUpgradeMessage + * alterable. + * @param string $rev + * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. + */ + public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { + // Example: Generate a post-upgrade message. + // if ($rev == '5.12.34') { + // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); + // } + } + + /* + * Important! All upgrade functions MUST add a 'runSql' task. + * Uncomment and use the following template for a new upgrade version + * (change the x in the function name): + */ + + // /** + // * Upgrade function. + // * + // * @param string $rev + // */ + // public function upgrade_5_0_x($rev) { + // $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev); + // $this->addTask('Do the foo change', 'taskFoo', ...); + // // Additional tasks here... + // // Note: do not use ts() in the addTask description because it adds unnecessary strings to transifex. + // // The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable. + // } + + // public static function taskFoo(CRM_Queue_TaskContext $ctx, ...) { + // return TRUE; + // } + +} diff --git a/CRM/Upgrade/Incremental/sql/5.2.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.2.alpha1.mysql.tpl new file mode 100644 index 0000000000..bf706f18e3 --- /dev/null +++ b/CRM/Upgrade/Incremental/sql/5.2.alpha1.mysql.tpl @@ -0,0 +1 @@ +{* file to handle db changes in 5.2.alpha1 during upgrade *} diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql index 0866972561..ed3a6a7448 100644 --- a/sql/civicrm_generated.mysql +++ b/sql/civicrm_generated.mysql @@ -398,7 +398,7 @@ UNLOCK TABLES; LOCK TABLES `civicrm_domain` WRITE; /*!40000 ALTER TABLE `civicrm_domain` DISABLE KEYS */; -INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'5.1.beta1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}'); +INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'5.2.alpha1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}'); /*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */; UNLOCK TABLES; diff --git a/xml/version.xml b/xml/version.xml index ce3fcbc33f..e49cd40ef8 100644 --- a/xml/version.xml +++ b/xml/version.xml @@ -1,4 +1,4 @@ - 5.1.beta1 + 5.2.alpha1 -- 2.25.1