diff --git a/civicrm/CRM/Upgrade/Form.php b/civicrm/CRM/Upgrade/Form.php
index 5fb36b6475a885d4ec81aad298221ec6ea2a70f5..e204d947f038eb47d0210817af98bf6cac5ce282 100644
--- a/civicrm/CRM/Upgrade/Form.php
+++ b/civicrm/CRM/Upgrade/Form.php
@@ -755,8 +755,6 @@ SET version = '$version'
$upgrade->setVersion($rev);
CRM_Utils_System::flushCache();
- $config = CRM_Core_Config::singleton();
- $config->userSystem->flush();
return TRUE;
}
@@ -771,6 +769,9 @@ SET version = '$version'
// Seems extraneous in context, but we'll preserve old behavior
$upgrade->setVersion($latestVer);
+ $config = CRM_Core_Config::singleton();
+ $config->userSystem->flush();
+
CRM_Core_Invoke::rebuildMenuAndCaches(FALSE, TRUE);
// NOTE: triggerRebuild is FALSE becaues it will run again in a moment (via fixSchemaDifferences).
diff --git a/civicrm/CRM/Upgrade/Incremental/sql/5.33.1.mysql.tpl b/civicrm/CRM/Upgrade/Incremental/sql/5.33.1.mysql.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..0722f2d74850fead1b73d096c8ca166c9b2a543f
--- /dev/null
+++ b/civicrm/CRM/Upgrade/Incremental/sql/5.33.1.mysql.tpl
@@ -0,0 +1 @@
+{* file to handle db changes in 5.33.1 during upgrade *}
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index aa0ea2ace2b1672da2b96b92b8e91ca60166f861..bf11f2124e58c6604094dd5ff76e86e236ae26a3 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.33.0',
+ return array( 'version' => '5.33.1',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md
index 5f2dbfbd41e02db208185729be92e311ba09ff6c..fe94527e7c5c494dcfb1ac8e96000794c94d4839 100644
--- a/civicrm/release-notes.md
+++ b/civicrm/release-notes.md
@@ -15,6 +15,15 @@ Other resources for identifying changes are:
* https://github.com/civicrm/civicrm-joomla
* https://github.com/civicrm/civicrm-wordpress
+## CiviCRM 5.33.1
+
+Released January 7, 2021
+
+- **[Synopsis](release-notes/5.33.1.md#synopsis)**
+- **[Bugs resolved](release-notes/5.33.1.md#bugs)**
+- **[Credits](release-notes/5.33.1.md#credits)**
+- **[Feedback](release-notes/5.33.1.md#feedback)**
+
## CiviCRM 5.33.0
Released January 6, 2021
diff --git a/civicrm/release-notes/5.33.1.md b/civicrm/release-notes/5.33.1.md
new file mode 100644
index 0000000000000000000000000000000000000000..d76990bde6d23756519d089587a2a0c869b53604
--- /dev/null
+++ b/civicrm/release-notes/5.33.1.md
@@ -0,0 +1,38 @@
+# CiviCRM 5.33.1
+
+Released January 7, 2021
+
+- **[Synopsis](#synopsis)**
+- **[Bugs resolved](#bugs)**
+- **[Credits](#credits)**
+- **[Feedback](#feedback)**
+
+## <a name="synopsis"></a>Synopsis
+
+| *Does this version...?* | |
+| --------------------------------------------------------------- | -------- |
+| Change the database schema? | no |
+| Alter the API? | no |
+| Require attention to configuration options? | no |
+| Fix problems installing or upgrading to a previous version? | **yes** |
+| Introduce features? | no |
+| **Fix bugs?** | **yes** |
+
+## <a name="bugs"></a>Bugs resolved
+
+* **_CiviContribute_: Fix fatal error on loading contribution page due to mismatched ts tags ([#19341](https://github.com/civicrm/civicrm-core/pull/19341))**
+
+* **_Upgrader_: Fix hook_permission error ([#19345](https://github.com/civicrm/civicrm-core/pull/19345))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+iXiam - Vangelis Pantazis; Coop SymbioTIC - Mathieu Lutfy; MJCO - Mikey O'Toole;
+JMA Consulting - Seamus Lee; CiviCRM - Tim Otten; DignityUSA - Logan Bear
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Tim Otten and Andrew Hunt. If you'd like to
+provide feedback on them, please login to https://chat.civicrm.org/civicrm and
+contact `@agh1`.
diff --git a/civicrm/sql/civicrm_data.mysql b/civicrm/sql/civicrm_data.mysql
index ff32c8b56b6a87a1b84ab68f432cdcf629a50951..7c4379d0c7cb8851191cf4e04b9a9925e20f0d13 100644
--- a/civicrm/sql/civicrm_data.mysql
+++ b/civicrm/sql/civicrm_data.mysql
@@ -23927,4 +23927,4 @@ INSERT INTO `civicrm_report_instance`
( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
VALUES
( @domainID, 'Survey Details', 'survey/detail', 'Detailed report for canvassing, phone-banking, walk lists or other surveys.', 'access CiviReport', 'a:39:{s:6:"fields";a:2:{s:9:"sort_name";s:1:"1";s:6:"result";s:1:"1";}s:22:"assignee_contact_id_op";s:2:"eq";s:25:"assignee_contact_id_value";s:0:"";s:12:"sort_name_op";s:3:"has";s:15:"sort_name_value";s:0:"";s:17:"street_number_min";s:0:"";s:17:"street_number_max";s:0:"";s:16:"street_number_op";s:3:"lte";s:19:"street_number_value";s:0:"";s:14:"street_name_op";s:3:"has";s:17:"street_name_value";s:0:"";s:15:"postal_code_min";s:0:"";s:15:"postal_code_max";s:0:"";s:14:"postal_code_op";s:3:"lte";s:17:"postal_code_value";s:0:"";s:7:"city_op";s:3:"has";s:10:"city_value";s:0:"";s:20:"state_province_id_op";s:2:"in";s:23:"state_province_id_value";a:0:{}s:13:"country_id_op";s:2:"in";s:16:"country_id_value";a:0:{}s:12:"survey_id_op";s:2:"in";s:15:"survey_id_value";a:0:{}s:12:"status_id_op";s:2:"eq";s:15:"status_id_value";s:1:"1";s:11:"custom_1_op";s:2:"in";s:14:"custom_1_value";a:0:{}s:11:"custom_2_op";s:2:"in";s:14:"custom_2_value";a:0:{}s:17:"custom_3_relative";s:1:"0";s:13:"custom_3_from";s:0:"";s:11:"custom_3_to";s:0:"";s:11:"description";s:75:"Detailed report for canvassing, phone-banking, walk lists or other surveys.";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:17:"access CiviReport";s:6:"groups";s:0:"";s:9:"domain_id";i:1;}');
-UPDATE civicrm_domain SET version = '5.33.0';
+UPDATE civicrm_domain SET version = '5.33.1';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index f7a817145a3fb7ffee103c2dbb71c535f42c30fa..06744530366ae3cfe114eb5f2b004184ef4dce7f 100644
--- a/civicrm/sql/civicrm_generated.mysql
+++ b/civicrm/sql/civicrm_generated.mysql
@@ -399,7 +399,7 @@ UNLOCK TABLES;
LOCK TABLES `civicrm_domain` WRITE;
/*!40000 ALTER TABLE `civicrm_domain` DISABLE KEYS */;
-INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,'5.33.0',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,'5.33.1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
/*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */;
UNLOCK TABLES;
diff --git a/civicrm/templates/CRM/Contribute/Form/Contribution.tpl b/civicrm/templates/CRM/Contribute/Form/Contribution.tpl
index d56be1a2dc8d179551d2a52095cda3dca87ee0b6..5dff905447c6e2aaefcdbfc0bc81f72f0facab25 100644
--- a/civicrm/templates/CRM/Contribute/Form/Contribution.tpl
+++ b/civicrm/templates/CRM/Contribute/Form/Contribution.tpl
@@ -25,9 +25,9 @@
{ts 1=$displayName}Use this form to submit a new contribution.{/ts}
{/if}
{if $contributionMode == 'live'}
- <strong>A LIVE transaction will be submitted</strong> using the selected payment processor.{/ts}
+ {ts}<strong>A LIVE transaction will be submitted</strong> using the selected payment processor.{/ts}
{else}
- <strong>A TEST transaction will be submitted</strong> using the selected payment processor.{/ts}
+ {ts}<strong>A TEST transaction will be submitted</strong> using the selected payment processor.{/ts}
{/if}
</div>
{/if}
diff --git a/civicrm/vendor/autoload.php b/civicrm/vendor/autoload.php
index 7bf9c858fdf71e475c63a9a1da6523f48373e6ae..669152f7568dad4ef83ba576f72dc989c36a622e 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInit6ebb87e78d25492b53ed88f982f514ff::getLoader();
+return ComposerAutoloaderInit78dc0a108461f60c575d15e43bc2fb7d::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index ed071fae9a65572c4e511b28d79cff7352f0a12c..519ba7babacc72359fa2c044a43ebd62044cae28 100644
--- a/civicrm/vendor/composer/autoload_real.php
+++ b/civicrm/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInit6ebb87e78d25492b53ed88f982f514ff
+class ComposerAutoloaderInit78dc0a108461f60c575d15e43bc2fb7d
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit6ebb87e78d25492b53ed88f982f514ff
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit6ebb87e78d25492b53ed88f982f514ff', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit78dc0a108461f60c575d15e43bc2fb7d', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit6ebb87e78d25492b53ed88f982f514ff', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit78dc0a108461f60c575d15e43bc2fb7d', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
@@ -31,7 +31,7 @@ class ComposerAutoloaderInit6ebb87e78d25492b53ed88f982f514ff
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInit6ebb87e78d25492b53ed88f982f514ff::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit78dc0a108461f60c575d15e43bc2fb7d::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -52,19 +52,19 @@ class ComposerAutoloaderInit6ebb87e78d25492b53ed88f982f514ff
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInit6ebb87e78d25492b53ed88f982f514ff::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInit78dc0a108461f60c575d15e43bc2fb7d::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequire6ebb87e78d25492b53ed88f982f514ff($fileIdentifier, $file);
+ composerRequire78dc0a108461f60c575d15e43bc2fb7d($fileIdentifier, $file);
}
return $loader;
}
}
-function composerRequire6ebb87e78d25492b53ed88f982f514ff($fileIdentifier, $file)
+function composerRequire78dc0a108461f60c575d15e43bc2fb7d($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;
diff --git a/civicrm/vendor/composer/autoload_static.php b/civicrm/vendor/composer/autoload_static.php
index 29b6e5f1e0ff71522a8b564dfe3fe330b4833fea..55a4a754bb04c1aae993a1384fc84a951a0bbcb1 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInit6ebb87e78d25492b53ed88f982f514ff
+class ComposerStaticInit78dc0a108461f60c575d15e43bc2fb7d
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@@ -570,11 +570,11 @@ class ComposerStaticInit6ebb87e78d25492b53ed88f982f514ff
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInit6ebb87e78d25492b53ed88f982f514ff::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInit6ebb87e78d25492b53ed88f982f514ff::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInit6ebb87e78d25492b53ed88f982f514ff::$prefixesPsr0;
- $loader->fallbackDirsPsr0 = ComposerStaticInit6ebb87e78d25492b53ed88f982f514ff::$fallbackDirsPsr0;
- $loader->classMap = ComposerStaticInit6ebb87e78d25492b53ed88f982f514ff::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit78dc0a108461f60c575d15e43bc2fb7d::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit78dc0a108461f60c575d15e43bc2fb7d::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInit78dc0a108461f60c575d15e43bc2fb7d::$prefixesPsr0;
+ $loader->fallbackDirsPsr0 = ComposerStaticInit78dc0a108461f60c575d15e43bc2fb7d::$fallbackDirsPsr0;
+ $loader->classMap = ComposerStaticInit78dc0a108461f60c575d15e43bc2fb7d::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index b7bc3fe482d8411b7a72168b7721f2eded8a1207..90e6c8df008d9e0651647d88c9f75321da174a28 100644
--- a/civicrm/xml/version.xml
+++ b/civicrm/xml/version.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="iso-8859-1" ?>
<version>
- <version_no>5.33.0</version_no>
+ <version_no>5.33.1</version_no>
</version>