Merge pull request #24117 from civicrm/5.52

[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 2ee27829d9b493b033ceb5e4d680534e4ff7d9b6..f407ba2cd2412381eda89e2e99fb42d38cde7144 100644 (file)
--- a/templates/CRM/common/civicrm.settings.php.template
+++ b/templates/CRM/common/civicrm.settings.php.template
@@ -41,9 +41,6 @@ global $civicrm_root, $civicrm_setting, $civicrm_paths;
  * Settings for Drupal 7.x:
  *      define( 'CIVICRM_UF'        , 'Drupal');
  *
- * Settings for Drupal 6.x:
- *      define( 'CIVICRM_UF'        , 'Drupal6');
- *
  * Settings for Joomla 1.7.x - 2.5.x:
  *      define( 'CIVICRM_UF'        , 'Joomla');
  *
@@ -600,7 +597,9 @@ if (!defined('CIVICRM_CLEANURL')) {
 }
 
 // force PHP to auto-detect Mac line endings
-ini_set('auto_detect_line_endings', '1');
+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'));