Skip to content

Commit

Permalink
Merge pull request #24092 from seamuslee001/php81_ini_deprecation
Browse files Browse the repository at this point in the history
[REF][PHP8.1] Do not set auto_detect_line_endings to true on php vers…
  • Loading branch information
eileenmcnaughton authored Jul 30, 2022
2 parents 2c56cf3 + 5d6ca81 commit 7cc1f81
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion templates/CRM/common/civicrm.settings.php.template
Original file line number Diff line number Diff line change
Expand Up @@ -597,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'));
Expand Down

0 comments on commit 7cc1f81

Please sign in to comment.