]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
projects / lorea / elgg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8b13885)
fixes #1193 - now specify charset in both metatag and http header
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Sun, 20 Dec 2009 19:58:01 +0000 (19:58 +0000)
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Sun, 20 Dec 2009 19:58:01 +0000 (19:58 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@3774 36083f99-b078-4883-b0ff-0f9b5a30f544

views/default/page_elements/header.php patch | blob | history
views/failsafe/pageshells/pageshell.php patch | blob | history

diff --git a/views/default/page_elements/header.php b/views/default/page_elements/header.php
index 48073654c10fed1faf717336da5f1f852ee7dfea..5710d7487a7e5391dbba3bb2331e19547862e00f 100644 (file)
--- a/views/default/page_elements/header.php
+++ b/views/default/page_elements/header.php
@@ -46,13 +46,16 @@ END;
        $feedref = "";
 }
 
+// we won't trust server configuration but specify utf-8
+header('Content-type: text/html; charset=utf-8');
+
 $version = get_version();
 $release = get_version(true);
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+       <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
        <meta name="ElggRelease" content="<?php echo $release; ?>" />
        <meta name="ElggVersion" content="<?php echo $version; ?>" />
        <title><?php echo $title; ?></title>
diff --git a/views/failsafe/pageshells/pageshell.php b/views/failsafe/pageshells/pageshell.php
index 468e00ef178241e9a18fbcde73bd770c9fc97364..7e9893e731d95080dbbde671f8902343bb06e35b 100644 (file)
--- a/views/failsafe/pageshells/pageshell.php
+++ b/views/failsafe/pageshells/pageshell.php
@@ -14,10 +14,15 @@
  * @uses $vars['body'] The main content of the page
  * @uses $vars['messages'] A 2d array of various message registers, passed from system_messages()
  */
+
+// we won't trust server configuration but specify utf-8
+header('Content-type: text/html; charset=utf-8');
+
 ?>
 <html>
        <head>
                <title><?php echo $vars['title']; ?></title>
+               <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
                <style type="text/css">
 
Social Networking Engine