From dd9b1693cf61d5ff3d5d80605b130069d1eb72ed Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Mon, 15 Nov 2004 19:46:02 +0000
Subject: [PATCH] forcing UTF-8

---
 lib/WebGUI/HTTP.pm                      | 3 +--
 lib/WebGUI/International.pm             | 2 +-
 lib/WebGUI/Style.pm                     | 2 +-
 lib/WebGUI/Wobject/SyndicatedContent.pm | 2 +-
 lib/WebGUI/i18n/English.pm              | 1 -
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/WebGUI/HTTP.pm b/lib/WebGUI/HTTP.pm
index 56fd55edd..14e03cda4 100644
--- a/lib/WebGUI/HTTP.pm
+++ b/lib/WebGUI/HTTP.pm
@@ -16,7 +16,6 @@ package WebGUI::HTTP;
 
 
 use strict;
-use WebGUI::International;
 use WebGUI::Session;
 use WebGUI::Style;
 
@@ -69,7 +68,7 @@ sub getHeader {
 	} else {
 		%params = (
 			-type => $session{http}{mimetype} || "text/html",
-			-charset => $session{http}{charset} || WebGUI::International::getLanguage($session{page}{languageId},"charset") || "UTF-8"
+			-charset => "UTF-8"
 			);
 		if ($session{setting}{preventProxyCache}) {
        	        	$params{"-expires"} = "-1d";
diff --git a/lib/WebGUI/International.pm b/lib/WebGUI/International.pm
index dfbabd613..6efdbfc50 100644
--- a/lib/WebGUI/International.pm
+++ b/lib/WebGUI/International.pm
@@ -104,7 +104,7 @@ Defaults to "English". The language to retrieve the properties for.
 
 =head3 propertyName
 
-If this is specified, only the value of the property will be returned, instead of the hash reference to all properties. The valid values are "charset", "toolbar", and "label".
+If this is specified, only the value of the property will be returned, instead of the hash reference to all properties. The valid values are "toolbar" and "label".
 
 =cut
 
diff --git a/lib/WebGUI/Style.pm b/lib/WebGUI/Style.pm
index aebdd3f47..b38c33af5 100644
--- a/lib/WebGUI/Style.pm
+++ b/lib/WebGUI/Style.pm
@@ -138,7 +138,7 @@ sub process {
 	}
 	$var{'head.tags'} = '
 		<meta name="generator" content="WebGUI '.$WebGUI::VERSION.'" />
-		<meta http-equiv="Content-Type" content="text/html; charset='.WebGUI::International::getLanguage($session{page}{languageId},"charset").'" />
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                 <script>
                         function getWebguiProperty (propName) {
                                 var props = new Array();
diff --git a/lib/WebGUI/Wobject/SyndicatedContent.pm b/lib/WebGUI/Wobject/SyndicatedContent.pm
index b2ab2a540..396bfcb4d 100644
--- a/lib/WebGUI/Wobject/SyndicatedContent.pm
+++ b/lib/WebGUI/Wobject/SyndicatedContent.pm
@@ -195,7 +195,7 @@ sub _get_rss_data {
 		if ($] >= 5.008 && $hasEncode) {
 			$xml =~ /<\?xml.*?encoding=['"](\S+)['"]/i;
 			my $xmlEncoding = $1;
-			my $encoding = WebGUI::International::getLanguage($session{page}{languageId},"charset");
+			my $encoding = "UTF-8";
 			if (lc($xmlEncoding) ne lc($encoding)) {
 				eval {	from_to($xml, $xmlEncoding, $encoding) };
 				WebGUI::ErrorHandler::warn($@) if ($@);
diff --git a/lib/WebGUI/i18n/English.pm b/lib/WebGUI/i18n/English.pm
index 04abb5757..398c38c1c 100644
--- a/lib/WebGUI/i18n/English.pm
+++ b/lib/WebGUI/i18n/English.pm
@@ -5,7 +5,6 @@ use strict;
 
 our $LANGUAGE = {
 	label => 'English',
-	charset => 'UTF-8',
 	toolbar => 'metal'
 };