summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
Diffstat (limited to 'includes')
-rw-r--r--includes/common.inc4
-rw-r--r--includes/theme.inc2
2 files changed, 3 insertions, 3 deletions
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";