diff --git a/civicrm.php b/civicrm.php
index 9891d7ea8316160925f10e488d65eb833cab59ea..02c1414ac4b67cd1eda12454e4b7cc20404a0ed3 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,7 +2,7 @@
/**
* Plugin Name: CiviCRM
* Description: CiviCRM - Growing and Sustaining Relationships
- * Version: 4.7
+ * Version: 5.33.2
* Requires at least: 4.9
* Requires PHP: 7.1
* Author: CiviCRM LLC
@@ -54,7 +54,7 @@ if (!defined('ABSPATH')) {
}
// Set version here: when it changes, will force Javascript & CSS to reload.
-define('CIVICRM_PLUGIN_VERSION', '4.7');
+define('CIVICRM_PLUGIN_VERSION', '5.33.2');
// Store reference to this file.
if (!defined('CIVICRM_PLUGIN_FILE')) {
diff --git a/civicrm/CRM/Grant/Export/Form/Map.php b/civicrm/CRM/Grant/Export/Form/Map.php
index 1dd59e910157bd637d106bfea1b5534b437b1ca8..3f7cedc2f73a847cbd39171f4afb969e03027a1c 100644
--- a/civicrm/CRM/Grant/Export/Form/Map.php
+++ b/civicrm/CRM/Grant/Export/Form/Map.php
@@ -18,6 +18,6 @@
/**
* This class gets the name of the file to upload
*/
-class CRM_Pledge_Export_Form_Map extends CRM_Export_Form_Map {
+class CRM_Grant_Export_Form_Map extends CRM_Export_Form_Map {
}
diff --git a/civicrm/CRM/Upgrade/Incremental/sql/5.33.2.mysql.tpl b/civicrm/CRM/Upgrade/Incremental/sql/5.33.2.mysql.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..8fc5f4ad38e2ceb30568ac606ddd90d85696e479
--- /dev/null
+++ b/civicrm/CRM/Upgrade/Incremental/sql/5.33.2.mysql.tpl
@@ -0,0 +1 @@
+{* file to handle db changes in 5.33.2 during upgrade *}
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index bf11f2124e58c6604094dd5ff76e86e236ae26a3..7063b52ac86d995bbc65f6d786e89aed4d05f28d 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.33.1',
+ return array( 'version' => '5.33.2',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/release-notes.md b/civicrm/release-notes.md
index fe94527e7c5c494dcfb1ac8e96000794c94d4839..96b737276c106a0390b98c2bc8a949664605dc18 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.2
+
+Released January 15, 2021
+
+- **[Synopsis](release-notes/5.33.2.md#synopsis)**
+- **[Bugs resolved](release-notes/5.33.2.md#bugs)**
+- **[Credits](release-notes/5.33.2.md#credits)**
+- **[Feedback](release-notes/5.33.2.md#feedback)**
+
## CiviCRM 5.33.1
Released January 7, 2021
diff --git a/civicrm/release-notes/5.33.2.md b/civicrm/release-notes/5.33.2.md
new file mode 100644
index 0000000000000000000000000000000000000000..c98934340aee2c0687109c6040007ea982f212c4
--- /dev/null
+++ b/civicrm/release-notes/5.33.2.md
@@ -0,0 +1,37 @@
+# CiviCRM 5.33.2
+
+Released January 15, 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? | no |
+| Introduce features? | no |
+| **Fix bugs?** | **yes** |
+
+## <a name="bugs"></a>Bugs resolved
+
+* **_CiviGrant_: Export fails due to malformed class ([dev/core#2298](https://lab.civicrm.org/dev/core/-/issues/2298): [#19381](https://github.com/civicrm/civicrm-core/pull/19381))**
+* **_WordPress_: Version incorrectly reported as 4.7 ([dev/wordpress#85](https://lab.civicrm.org/dev/wordpress/-/issues/85): [#19384](https://github.com/civicrm/civicrm-core/pull/19384))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; Tadpole Collective - Kevin Cristiano; JMA
+Consulting - Seamus Lee; Dmitry Smirnov; CiviCRM - Tim Otten; Christian Wach
+
+## <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 7c4379d0c7cb8851191cf4e04b9a9925e20f0d13..ee2e1e7022c04a6a9fbe812aff0a3215bb290e5c 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.1';
+UPDATE civicrm_domain SET version = '5.33.2';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index 06744530366ae3cfe114eb5f2b004184ef4dce7f..002857c2b04c2af3440aad063dc20d33395d7d6c 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.1',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.2',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
/*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */;
UNLOCK TABLES;
diff --git a/civicrm/vendor/autoload.php b/civicrm/vendor/autoload.php
index 669152f7568dad4ef83ba576f72dc989c36a622e..56534f0594288122d85e1f5e699b675b93eaf74c 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInit78dc0a108461f60c575d15e43bc2fb7d::getLoader();
+return ComposerAutoloaderInit2f2e10e7d5424fb212df83b127157beb::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index 519ba7babacc72359fa2c044a43ebd62044cae28..d868767362c10e36737c2cadefdd9872b1d3c3cd 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 ComposerAutoloaderInit78dc0a108461f60c575d15e43bc2fb7d
+class ComposerAutoloaderInit2f2e10e7d5424fb212df83b127157beb
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit78dc0a108461f60c575d15e43bc2fb7d
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit78dc0a108461f60c575d15e43bc2fb7d', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit2f2e10e7d5424fb212df83b127157beb', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit78dc0a108461f60c575d15e43bc2fb7d', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit2f2e10e7d5424fb212df83b127157beb', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
@@ -31,7 +31,7 @@ class ComposerAutoloaderInit78dc0a108461f60c575d15e43bc2fb7d
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInit78dc0a108461f60c575d15e43bc2fb7d::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit2f2e10e7d5424fb212df83b127157beb::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -52,19 +52,19 @@ class ComposerAutoloaderInit78dc0a108461f60c575d15e43bc2fb7d
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInit78dc0a108461f60c575d15e43bc2fb7d::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInit2f2e10e7d5424fb212df83b127157beb::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequire78dc0a108461f60c575d15e43bc2fb7d($fileIdentifier, $file);
+ composerRequire2f2e10e7d5424fb212df83b127157beb($fileIdentifier, $file);
}
return $loader;
}
}
-function composerRequire78dc0a108461f60c575d15e43bc2fb7d($fileIdentifier, $file)
+function composerRequire2f2e10e7d5424fb212df83b127157beb($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 55a4a754bb04c1aae993a1384fc84a951a0bbcb1..afbe29cafd581fd6038747e994f8a4f50e6b2d02 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInit78dc0a108461f60c575d15e43bc2fb7d
+class ComposerStaticInit2f2e10e7d5424fb212df83b127157beb
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@@ -570,11 +570,11 @@ class ComposerStaticInit78dc0a108461f60c575d15e43bc2fb7d
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInit78dc0a108461f60c575d15e43bc2fb7d::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInit78dc0a108461f60c575d15e43bc2fb7d::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInit78dc0a108461f60c575d15e43bc2fb7d::$prefixesPsr0;
- $loader->fallbackDirsPsr0 = ComposerStaticInit78dc0a108461f60c575d15e43bc2fb7d::$fallbackDirsPsr0;
- $loader->classMap = ComposerStaticInit78dc0a108461f60c575d15e43bc2fb7d::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit2f2e10e7d5424fb212df83b127157beb::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit2f2e10e7d5424fb212df83b127157beb::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInit2f2e10e7d5424fb212df83b127157beb::$prefixesPsr0;
+ $loader->fallbackDirsPsr0 = ComposerStaticInit2f2e10e7d5424fb212df83b127157beb::$fallbackDirsPsr0;
+ $loader->classMap = ComposerStaticInit2f2e10e7d5424fb212df83b127157beb::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index 90e6c8df008d9e0651647d88c9f75321da174a28..d5f202bbe3f52886a6466fdfd9d388ffd7a61eef 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.1</version_no>
+ <version_no>5.33.2</version_no>
</version>