Commit ac491fe3 authored by mattwire's avatar mattwire

Check for user message templates as well as system workflow

parent 020142e0
Package: msgtplblocker
Copyright (C) 2019, FIXME <FIXME>
Copyright (C) 2020, CiviCRM.org
Licensed under the GNU Affero Public License 3.0 (below).
-------------------------------------------------------------------------------
......
......@@ -15,8 +15,8 @@ The extension is licensed under [AGPL-3.0](LICENSE.txt).
## Requirements
* PHP v7.0+ (tested on PHP 7.3)
* CiviCRM 5.latest
* PHP v7.1+ (tested on PHP 7.3)
* CiviCRM 5.19+
## Installation
......@@ -38,3 +38,9 @@ With time, as people request features, it might provide a more fine-grained set
## Support
https://www.symbiotic.coop/en
## Changelog
### 1.2
* Check for user message templates as well as system workflow - fixes the issue that user driven messagetemplates were ignored by this extension.
......@@ -5,8 +5,8 @@
<description>Blocks a configurable list of message templates emails (such as contribution receipts) and optionally records them as an activity.</description>
<license>AGPL-3.0</license>
<maintainer>
<author>Mathieu Lutfy</author>
<email>mathieu@symbiotic.coop</email>
<author>Mathieu Lutfy, Matthew Wire (MJW)</author>
<email>mathieu@symbiotic.coop, support@mjw.pt</email>
</maintainer>
<urls>
<url desc="Main Extension Page">https://lab.civicrm.org/extensions/msgtplblocker</url>
......@@ -14,13 +14,12 @@
<url desc="Support">https://lab.civicrm.org/extensions/msgtplblocker/issues</url>
<url desc="Licensing">https://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2019-08-22</releaseDate>
<version>1.1</version>
<releaseDate>2020-03-22</releaseDate>
<version>1.2</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.13</ver>
<ver>5.19</ver>
</compatibility>
<comments>See the README for more information.</comments>
<civix>
<namespace>CRM/Msgtplblocker</namespace>
</civix>
......
......@@ -125,7 +125,7 @@ function msgtplblocker_civicrm_alterMailParams(&$params, $context) {
return;
}
// This checks if we are in messageTemplate context
if (empty($params['valueName'])) {
if (empty($params['valueName']) && empty($params['messageTemplateID'])) {
return;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment