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 #11840 from mfb/smtp-reconnect
[civicrm-core.git]
/
templates
/
CRM
/
common
/
civicrm.settings.php.template
diff --git
a/templates/CRM/common/civicrm.settings.php.template
b/templates/CRM/common/civicrm.settings.php.template
index bb575170a44a5afbdfee188d5a967cc557e2b4a2..ae4d6e269fd86876a2bdfdf6a02de88816fe9da9 100644
(file)
--- a/
templates/CRM/common/civicrm.settings.php.template
+++ b/
templates/CRM/common/civicrm.settings.php.template
@@
-1,7
+1,7
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version
4.7
|
+ | CiviCRM version
5
|
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@
-304,6
+304,13
@@
if (!defined('CIVICRM_MAIL_SMARTY')) {
// define( 'CIVICRM_MAIL_LOG', '%%templateCompileDir%%/mail.log');
// }
// define( 'CIVICRM_MAIL_LOG', '%%templateCompileDir%%/mail.log');
// }
+/**
+ * This setting will only work if CIVICRM_MAIL_LOG is defined. Mail will be logged and then sent.
+ */
+//if (!defined('CIVICRM_MAIL_LOG_AND_SEND')) {
+// define( 'CIVICRM_MAIL_LOG_AND_SEND', 1);
+//}
+
if (!defined('CIVICRM_DOMAIN_ID')) {
define( 'CIVICRM_DOMAIN_ID', 1);
if (!defined('CIVICRM_DOMAIN_ID')) {
define( 'CIVICRM_DOMAIN_ID', 1);