From 393245843ad335352a0ed9c41e103d1b32b5c224 Mon Sep 17 00:00:00 2001 From: Jesper Kristensen Date: Mon, 27 May 2024 10:41:42 +0200 Subject: [PATCH 1/2] ITKDev: php warning if unserialize fails in encrypt patch --- CHANGELOG.md | 4 ++++ composer.json | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f85c82ce..02556738 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ before starting to add changes. Use example [placed in the end of the page](#exa ## [Unreleased] +- [#108](https://github.com/OS2Forms/os2forms/pull/108) + Patched webform encrypt to suppress warning when data is mixed between + encrypted and not encrypted fields. + ## [3.15.1] 2024-05-14 - Added missing return type. diff --git a/composer.json b/composer.json index beee4327..15077228 100644 --- a/composer.json +++ b/composer.json @@ -116,7 +116,8 @@ "entityQuery reference JOINs should specify target_type (https://www.drupal.org/project/dynamic_entity_reference/issues/3120952#comment-14141038)": "https://www.drupal.org/files/issues/2021-06-22/entityquery-reference-joins-should-specify-target_type-3120952-24.patch" }, "drupal/webform_encrypt": { - "Ensure data is base64 encoded (https://www.drupal.org/project/webform_encrypt/issues/3399414)": "https://git.drupalcode.org/project/webform_encrypt/-/merge_requests/4.patch" + "Ensure data is base64 encoded (https://www.drupal.org/project/webform_encrypt/issues/3399414)": "https://git.drupalcode.org/project/webform_encrypt/-/merge_requests/4.patch", + "PHP Warning if unserialize fails (https://www.drupal.org/project/webform_encrypt/issues/3292305)": "https://www.drupal.org/files/issues/2022-06-23/unserialize-php-notice.patch" } } }, From a12e3aa1effc3faea10051b847b4afdb62385657 Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Mon, 27 May 2024 10:53:24 +0200 Subject: [PATCH 2/2] Release 3.15.2 --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 02556738..db0ded3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ before starting to add changes. Use example [placed in the end of the page](#exa ## [Unreleased] +## [3.15.2] 2024-05-27 + - [#108](https://github.com/OS2Forms/os2forms/pull/108) Patched webform encrypt to suppress warning when data is mixed between encrypted and not encrypted fields. @@ -228,7 +230,8 @@ before starting to add changes. Use example [placed in the end of the page](#exa - Security in case of vulnerabilities. ``` -[Unreleased]: https://github.com/OS2Forms/os2forms/compare/3.15.1...HEAD +[Unreleased]: https://github.com/OS2Forms/os2forms/compare/3.15.2...HEAD +[3.15.2]: https://github.com/OS2Forms/os2forms/compare/3.15.1...3.15.2 [3.15.1]: https://github.com/OS2Forms/os2forms/compare/3.15.0...3.15.1 [3.15.0]: https://github.com/OS2Forms/os2forms/compare/3.14.1...3.15.0 [3.14.1]: https://github.com/OS2Forms/os2forms/compare/3.14.0...3.14.1