Skip to content
Snippets Groups Projects
Commit 3a3a8b47 authored by Jared Hancock's avatar Jared Hancock
Browse files

i18n: Ensure UTF-8 is used as the request encoding

parent f1e31ba6
No related branches found
No related tags found
No related merge requests found
...@@ -199,6 +199,9 @@ class Bootstrap { ...@@ -199,6 +199,9 @@ class Bootstrap {
} }
function i18n_prep() { function i18n_prep() {
ini_set('default_charset', 'utf-8');
ini_set('output_encoding', 'utf-8');
// MPDF requires mbstring functions // MPDF requires mbstring functions
if (!extension_loaded('mbstring')) { if (!extension_loaded('mbstring')) {
if (function_exists('iconv')) { if (function_exists('iconv')) {
......
...@@ -5,7 +5,7 @@ $signin_url = ROOT_PATH . "login.php" ...@@ -5,7 +5,7 @@ $signin_url = ROOT_PATH . "login.php"
. ($thisclient ? "?e=".urlencode($thisclient->getEmail()) : ""); . ($thisclient ? "?e=".urlencode($thisclient->getEmail()) : "");
$signout_url = ROOT_PATH . "logout.php?auth=".$ost->getLinkToken(); $signout_url = ROOT_PATH . "logout.php?auth=".$ost->getLinkToken();
header("Content-Type: text/html; charset=UTF-8\r\n"); header("Content-Type: text/html; charset=UTF-8");
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<html <?php <html <?php
......
<?php if (!isset($_SERVER['HTTP_X_PJAX'])) { ?> <?php
header("Content-Type: text/html; charset=UTF-8");
if (!isset($_SERVER['HTTP_X_PJAX'])) { ?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html <?php <html <?php
if (($lang = Internationalization::getCurrentLanguage()) if (($lang = Internationalization::getCurrentLanguage())
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment