diff --git a/main/inc/global.inc.php b/main/inc/global.inc.php index 3f1abba1c6..e31f1d2d85 100644 --- a/main/inc/global.inc.php +++ b/main/inc/global.inc.php @@ -232,10 +232,10 @@ if (empty($charset)) { // Preserving the value of the global variable $charset. $charset_initial_value = $charset; -// Initialization of the multibyte string library. -api_initialize_string_library(); -// Initialization of the default encoding that will be used by the multibyte string routines. -api_set_string_library_default_encoding($charset); +// Initialization of the internationalization library. +api_initialize_internationalization(); +// Initialization of the default encoding that will be used by the multibyte string routines in the internationalization library. +api_set_internationalization_default_encoding($charset); /* -------------------------------------------- diff --git a/main/inc/lib/internationalization.lib.php b/main/inc/lib/internationalization.lib.php index 5e84696739..4e6795082f 100644 --- a/main/inc/lib/internationalization.lib.php +++ b/main/inc/lib/internationalization.lib.php @@ -43,11 +43,11 @@ define('PERSON_NAME_DATA_EXPORT', PERSON_NAME_EASTERN_ORDER); // Contextual: fo */ /** - * Initialization of some internal default valies of the multibyte string library. + * Initialization of some internal default valies in the internationalization library. * @return void - * Note: This function should be called once in the initialization script. + * Note: This function should be called only once in the global initialization script. */ -function api_initialize_string_library() { +function api_initialize_internationalization() { if (MBSTRING_INSTALLED) { @ini_set('mbstring.func_overload', 0); @ini_set('mbstring.encoding_translation', 0); @@ -55,7 +55,7 @@ function api_initialize_string_library() { @ini_set('mbstring.http_output', 'pass'); @ini_set('mbstring.language', 'neutral'); } - api_set_string_library_default_encoding('ISO-8859-15'); + api_set_internationalization_default_encoding('ISO-8859-15'); } /** @@ -63,7 +63,7 @@ function api_initialize_string_library() { * @param string $encoding The specified default encoding. * @return string Returns the old value of the default encoding. */ -function api_set_string_library_default_encoding($encoding) { +function api_set_internationalization_default_encoding($encoding) { $encoding = api_refine_encoding_id($encoding); $result = _api_mb_internal_encoding(); _api_mb_internal_encoding($encoding); diff --git a/main/install/index.php b/main/install/index.php index d57ab8618e..926d930d5f 100755 --- a/main/install/index.php +++ b/main/install/index.php @@ -126,10 +126,10 @@ if (isset($install_language)) { } header('Content-Type: text/html; charset='. $charset); -// Initialization of the multibyte string library. -api_initialize_string_library(); -// Initialization of the default encoding that will be used by the multibyte string routines. -api_set_string_library_default_encoding($charset); +// Initialization of the internationalization library. +api_initialize_internationalization(); +// Initialization of the default encoding that will be used by the multibyte string routines in the internationalization library. +api_set_internationalization_default_encoding($charset); require_once 'install_upgrade.lib.php'; //also defines constants require_once 'install_functions.inc.php';