From 6a19a2e829d795e2539a5606f87034e21360eff8 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Tue, 2 May 2023 13:56:44 -0700 Subject: [PATCH] dev/core#4262 - Drop auto_detect_line_endings from civicrm.settings.php.template If the upgrader is telling you to remove it from `civicrm.settings.php`, then... we probably don't need it in `civicrm.settings.php.template`... --- templates/CRM/common/civicrm.settings.php.template | 5 ----- 1 file changed, 5 deletions(-) diff --git a/templates/CRM/common/civicrm.settings.php.template b/templates/CRM/common/civicrm.settings.php.template index bbca62d39f..ffb2bc2dd5 100644 --- a/templates/CRM/common/civicrm.settings.php.template +++ b/templates/CRM/common/civicrm.settings.php.template @@ -601,11 +601,6 @@ if (!defined('CIVICRM_CLEANURL')) { } } -// force PHP to auto-detect Mac line endings -if (version_compare(PHP_VERSION, '8.1') < 0) { - ini_set('auto_detect_line_endings', '1'); -} - // make sure the memory_limit is at least 64 MB $memLimitString = trim(ini_get('memory_limit')); $memLimitUnit = strtolower(substr($memLimitString, -1)); -- 2.25.1