Merge pull request #22449 from mattwire/phpnotices

[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 29c97b69c557239a24c306bf07b7dca8a1922100..2ee27829d9b493b033ceb5e4d680534e4ff7d9b6 100644 (file)
--- a/templates/CRM/common/civicrm.settings.php.template
+++ b/templates/CRM/common/civicrm.settings.php.template
@@ -176,8 +176,6 @@ if (!defined('CIVICRM_LOGGING_DSN')) {
  *
  */
 
-global $civicrm_root;
-
 $civicrm_root = '%%crmRoot%%';
 if (!defined('CIVICRM_TEMPLATE_COMPILEDIR')) {
   define( 'CIVICRM_TEMPLATE_COMPILEDIR', '%%templateCompileDir%%');
@@ -195,7 +193,19 @@ if (!defined('CIVICRM_TEMPLATE_COMPILEDIR')) {
  *
  */
 //if (!defined('CIVICRM_TEMPLATE_COMPILE_CHECK')) {
-//  define( 'CIVICRM_TEMPLATE_COMPILE_CHECK', FALSE);
+//  define('CIVICRM_TEMPLATE_COMPILE_CHECK', FALSE);
+//}
+
+/**
+ * Smarty escape on output.
+ *
+ * This tells smarty to pass all variables through the escape function
+ * unless they are piped to smarty:nodefaults (eg. {$myScript|smarty:nodefaults}
+ * At this stage it should only be enabled on development sites.
+ * @see https://github.com/civicrm/civicrm-core/pull/21935
+ */
+//if (!defined('CIVICRM_SMARTY_DEFAULT_ESCAPE')) {
+//  define('CIVICRM_SMARTY_DEFAULT_ESCAPE', TRUE);
 //}
 
 /**