projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #14485 from seamuslee001/domain_uniqueness_cache_key
[civicrm-core.git]
/
CRM
/
Mailing
/
Config.php
diff --git
a/CRM/Mailing/Config.php
b/CRM/Mailing/Config.php
index 1a93030ba4d2704c84be5e6fc45e874b7d1019f2..79fdb2028ecd940f29fb4cd9d5c2f46e80a21aef 100644
(file)
--- a/
CRM/Mailing/Config.php
+++ b/
CRM/Mailing/Config.php
@@
-3,7
+3,7
@@
+--------------------------------------------------------------------+
| CiviCRM version 5 |
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
| CiviCRM version 5 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
8
|
+ | Copyright CiviCRM LLC (c) 2004-201
9
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-28,7
+28,7
@@
/**
*
* @package CRM
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-201
8
+ * @copyright CiviCRM LLC (c) 2004-201
9
*/
class CRM_Mailing_Config {
*/
class CRM_Mailing_Config {
@@
-36,7
+36,8
@@
class CRM_Mailing_Config {
const OUTBOUND_OPTION_SENDMAIL = 1;
const OUTBOUND_OPTION_DISABLED = 2;
const OUTBOUND_OPTION_MAIL = 3;
const OUTBOUND_OPTION_SENDMAIL = 1;
const OUTBOUND_OPTION_DISABLED = 2;
const OUTBOUND_OPTION_MAIL = 3;
- const OUTBOUND_OPTION_MOCK = 4; // seems to be the same as 2, but also calls Mail's pre/post hooks? - see packages/Mail
+ // seems to be the same as 2, but also calls Mail's pre/post hooks? - see packages/Mail
+ const OUTBOUND_OPTION_MOCK = 4;
const OUTBOUND_OPTION_REDIRECT_TO_DB = 5;
// special value for mail bulk inserts to avoid
const OUTBOUND_OPTION_REDIRECT_TO_DB = 5;
// special value for mail bulk inserts to avoid