Merge pull request #19393 from civicrm/5.34

5.34

distmaker/dists/common.sh

@@ -232,8 +232,8 @@ function dm_install_wordpress() {
     "$repo/./"  "$to/./"
   ## Need --exclude=civicrm for self-building on WP site
 
-  dm_preg_edit '/^Version: [0-9\.]+/m' "Version: $DM_VERSION" "$to/civicrm.php"
-  dm_preg_edit "/^define\( \'CIVICRM_PLUGIN_VERSION\',\W'[0-9\.]+/m" "define( 'CIVICRM_PLUGIN_VERSION', '$DM_VERSION" "$to/civicrm.php"
+  dm_preg_edit '/^([ \*]*)Version: [0-9\.]+/m' "\1Version: $DM_VERSION" "$to/civicrm.php"
+  dm_preg_edit "/^define\( *\'CIVICRM_PLUGIN_VERSION\', *'[0-9\.]+/m" "define('CIVICRM_PLUGIN_VERSION', '$DM_VERSION" "$to/civicrm.php"
 }
 
 ## Generate the composer "vendor" folder

release-notes.md

@@ -26,6 +26,15 @@ Released February 3, 2021
 - **[Credits](release-notes/5.34.0.md#credits)**
 - **[Feedback](release-notes/5.34.0.md#feedback)**
 
+## 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

release-notes/5.33.2.md

+# 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`.