diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-12-20 19:58:01 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-12-20 19:58:01 +0000 |
| commit | df22b23fa92a64277631109593016a7f7e8fd22b (patch) | |
| tree | bd545d1960dbc6010672ed247b8c37483ca4c7d1 | |
| parent | 8b13885cf31c84249bd5977376707737083cc630 (diff) | |
| download | elgg-df22b23fa92a64277631109593016a7f7e8fd22b.tar.gz elgg-df22b23fa92a64277631109593016a7f7e8fd22b.tar.bz2 | |
fixes #1193 - now specify charset in both metatag and http header
git-svn-id: http://code.elgg.org/elgg/trunk@3774 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | views/default/page_elements/header.php | 5 | ||||
| -rw-r--r-- | views/failsafe/pageshells/pageshell.php | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/views/default/page_elements/header.php b/views/default/page_elements/header.php index 48073654c..5710d7487 100644 --- 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 468e00ef1..7e9893e73 100644 --- 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"> |