From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 25 Sep 2004 10:08:42 +0000 (+0000)
Subject: Change LanguageEn to be UTF-8 by default. This fixes the problem with
X-Git-Tag: 1.5.0alpha1~1802
X-Git-Url: https://git.cyclocoop.org/admin/?a=commitdiff_plain;h=d586617605919d6d91ea9bb7a68b332ac90c3505;p=lhc%2Fweb%2Fwiklou.git

Change LanguageEn to be UTF-8 by default. This fixes the problem with
language selection destroying non-ASCII characters when English was selected.
---

diff --git a/includes/Setup.php b/includes/Setup.php
index bf574bc676..03de205401 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -227,8 +227,8 @@ function setupLangObj(&$langclass, $langcode) {
 	global $wgUseLatin1;
 
 
-	if( ! class_exists( $langclass ) || ($langcode == 'en' && !$wgUseLatin1) ) {
-# Default to English/UTF-8
+	if( ! class_exists( $langclass ) ) {
+		# Default to English/UTF-8
 		require_once( 'languages/LanguageUtf8.php' );
 		$langclass = 'LanguageUtf8';
 	}
@@ -238,8 +238,8 @@ function setupLangObj(&$langclass, $langcode) {
 		print "No language class ($wgLang)\N";
 	}
 
-	if( $wgUseLatin1 && $langcode != 'en' ) {
-# For non-UTF-8 non-English.
+	if( $wgUseLatin1 ) {
+		# For non-UTF-8 latin-1 downconversion
 		require_once( 'languages/LanguageLatin1.php' );
 		$xxx = new LanguageLatin1( $lang );
 		unset( $lang );
diff --git a/languages/LanguageEn.php b/languages/LanguageEn.php
index 3c3e3ec125..777fe8890f 100644
--- a/languages/LanguageEn.php
+++ b/languages/LanguageEn.php
@@ -1,7 +1,9 @@
 <?php
 # See language.doc
 
-class LanguageEn extends Language {
+require_once( 'LanguageUtf8.php' );
+
+class LanguageEn extends LanguageUtf8 {
 	# Inherit everything
 }