From: Rotem Liss <rotem@users.mediawiki.org>
Date: Sun, 6 Aug 2006 14:23:53 +0000 (+0000)
Subject: Changing all the last references from LanguageUtf8 to Language, and finally removing it.
X-Git-Tag: 1.31.0-rc.0~56050
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=0be256bcba910fa6ad1fcd286ec7ffd38568bfbd;p=lhc%2Fweb%2Fwiklou.git

Changing all the last references from LanguageUtf8 to Language, and finally removing it.
---

diff --git a/includes/Utf8Case.php b/includes/Utf8Case.php
index 9a2c73023d..8c7fdd0b8d 100644
--- a/includes/Utf8Case.php
+++ b/includes/Utf8Case.php
@@ -6,7 +6,7 @@
  * Hack for bugs in ucfirst() and company
  *
  * These are pulled from memcached if possible, as this is faster than filling
- * up a big array manually. See also languages/LanguageUtf8.php
+ * up a big array manually.
  * @package MediaWiki
  * @subpackage Language
  */
diff --git a/languages/Language.php b/languages/Language.php
index fc893c08be..33e5f467e4 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1524,6 +1524,4 @@ class Language {
 	}
 }
 
-/** @deprecated */
-class LanguageUtf8 extends Language {}
 ?>
diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index d0c9d60ae8..2e504360a9 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -642,7 +642,7 @@ class LanguageConverter {
 
 		if ($this->mUcfirst) {
 			foreach ($ret as $k => $v) {
-				$ret[LanguageUtf8::ucfirst($k)] = LanguageUtf8::ucfirst($v);
+				$ret[Language::ucfirst($k)] = Language::ucfirst($v);
 			}
 		}
 		return $ret;
diff --git a/languages/LanguageJa.php b/languages/LanguageJa.php
index 7268fd5efe..800650b046 100644
--- a/languages/LanguageJa.php
+++ b/languages/LanguageJa.php
@@ -29,7 +29,7 @@ class LanguageJa extends Language {
 		$s = preg_replace( '/\xef\xbd([\x80-\x99])/e', 'chr((ord("$1") & 0x3f) + 0x60)', $s );
 
 		# Do general case folding and UTF-8 armoring
-		return LanguageUtf8::stripForSearch( $s );
+		return parent::stripForSearch( $s );
 	}
 
 	# Italic is not appropriate for Japanese script
diff --git a/languages/LanguageZh.php b/languages/LanguageZh.php
index 0b1d6bfa1b..d3a62da101 100644
--- a/languages/LanguageZh.php
+++ b/languages/LanguageZh.php
@@ -84,7 +84,7 @@ class LanguageZh extends LanguageZh_cn {
 		//other way around
 
 		$t = $this->mConverter->autoConvert($t, 'zh-cn');
-		$t = LanguageUtf8::stripForSearch( $t );
+		$t = parent::stripForSearch( $t );
 		wfProfileOut( $fname );
 		return $t;
 
diff --git a/tests/SearchEngineTest.php b/tests/SearchEngineTest.php
index 20d8017ea2..0a02c49c9c 100644
--- a/tests/SearchEngineTest.php
+++ b/tests/SearchEngineTest.php
@@ -8,7 +8,6 @@ require_once( '../includes/Profiling.php' );
 require_once( '../includes/Hooks.php' );
 require_once( '../includes/MagicWord.php' );
 require_once( '../languages/Language.php' );
-require_once( '../languages/LanguageUtf8.php' );
 
 require_once( '../includes/SearchEngine.php' );
 
diff --git a/tests/SearchMySQL4Test.php b/tests/SearchMySQL4Test.php
index a18e22c603..6277e6ca34 100644
--- a/tests/SearchMySQL4Test.php
+++ b/tests/SearchMySQL4Test.php
@@ -11,7 +11,7 @@ class SearchMySQL4Test extends SearchEngine_TestCase {
 	}
 
 	function setUp() {
-		$GLOBALS['wgContLang'] = new LanguageUtf8;
+		$GLOBALS['wgContLang'] = new Language;
 		$this->db =& buildTestDatabase(
 			'mysql4',
 			array( 'page', 'revision', 'text', 'searchindex' ) );