Merge pull request #1918 from greezybacon/issue/1906

i18n: Ensure UTF-8 is used as the request encoding Reviewed-By: Peter Rotich <peter@osticket.com>

Merge pull request #1918 from greezybacon/issue/1906
i18n: Ensure UTF-8 is used as the request encoding Reviewed-By: Peter Rotich <peter@osticket.com>
193a1c69 · Peter Rotich · 8d166a2b · 3a3a8b47 · 193a1c69 · 193a1c69
Commit 193a1c69 authored 10 years ago by Peter Rotich
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -199,6 +199,9 @@ class Bootstrap {
    }

    function i18n_prep() {
+        ini_set('default_charset', 'utf-8');
+        ini_set('output_encoding', 'utf-8');
+
        // MPDF requires mbstring functions
        if (!extension_loaded('mbstring')) {
            if (function_exists('iconv')) {

--- a/include/client/header.inc.php
+++ b/include/client/header.inc.php
@@ -5,7 +5,7 @@ $signin_url = ROOT_PATH . "login.php"
    . ($thisclient ? "?e=".urlencode($thisclient->getEmail()) : "");
 $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>
 <html <?php

--- a/include/staff/header.inc.php
+++ b/include/staff/header.inc.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">
 <html <?php
 if (($lang = Internationalization::getCurrentLanguage())