From a448f5a9b46c5a5e5bcd64072a420bef33161a44 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 8 Jun 2003 16:50:05 +0000
Subject: - Charset simpliciations.  Patch #46 by Al.

---
 includes/common.inc | 4 ++--
 includes/theme.inc  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'includes')

diff --git a/includes/common.inc b/includes/common.inc
index 9909da1a2..3b30032d0 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -203,7 +203,7 @@ function variable_del($name) {
 }
 
 function drupal_specialchars($input) {
-  return htmlspecialchars($input, ENT_NOQUOTES, variable_get("site_charset", "iso-8859-1"));
+  return htmlspecialchars($input, ENT_NOQUOTES, "utf-8");
 }
 
 function table_cell($cell, $header = 0) {
@@ -1025,7 +1025,7 @@ $conf = variable_init(isset($conf) ? $conf : array());
 set_error_handler("error_handler");
 
 // spit out the correct charset http header
-header("Content-Type: text/html; charset=". variable_get("site_charset", "iso-8859-1"));
+header("Content-Type: text/html; charset=utf-8");
 
 // initialize installed modules:
 module_init();
diff --git a/includes/theme.inc b/includes/theme.inc
index dce4cff1b..643e39323 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -144,7 +144,7 @@ function theme_list($refresh = 0) {
 
 function theme_head($main = 0) {
   global $base_url;
-  $output .= "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=". variable_get("site_charset", "iso-8859-1") ."\" />";
+  $output .= "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />";
   $output .= "<base href=\"$base_url/\" />\n";
   $output .= "<style type=\"text/css\">\n";
   $output .= "@import url(misc/drupal.css);\n";
-- 
cgit v1.2.3