Commit 33c7e4da authored by webchick's avatar webchick
Browse files

#614124 by Damien Tournoud: Set locale settings during bootstrap.

parent 0c707d82
...@@ -523,6 +523,10 @@ function drupal_environment_initialize() { ...@@ -523,6 +523,10 @@ function drupal_environment_initialize() {
ini_set('session.cache_limiter', 'none'); ini_set('session.cache_limiter', 'none');
// Use httponly session cookies. // Use httponly session cookies.
ini_set('session.cookie_httponly', '1'); ini_set('session.cookie_httponly', '1');
// Set sane locale settings, to ensure consistent string, dates, times and
// numbers handling.
setlocale(LC_ALL, 'C');
} }
/** /**
......
...@@ -39,9 +39,6 @@ function _unicode_check() { ...@@ -39,9 +39,6 @@ function _unicode_check() {
// Ensure translations don't break at install time // Ensure translations don't break at install time
$t = get_t(); $t = get_t();
// Set the standard C locale to ensure consistent, ASCII-only string handling.
setlocale(LC_CTYPE, 'C');
// Check for mbstring extension // Check for mbstring extension
if (!function_exists('mb_strlen')) { if (!function_exists('mb_strlen')) {
return array(UNICODE_SINGLEBYTE, $t('Operations on Unicode strings are emulated on a best-effort basis. Install the <a href="@url">PHP mbstring extension</a> for improved Unicode support.', array('@url' => 'http://www.php.net/mbstring'))); return array(UNICODE_SINGLEBYTE, $t('Operations on Unicode strings are emulated on a best-effort basis. Install the <a href="@url">PHP mbstring extension</a> for improved Unicode support.', array('@url' => 'http://www.php.net/mbstring')));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment