From: SamanthaNguyen <samanthanguyen1116@gmail.com>
Date: Tue, 22 Jan 2019 03:35:32 +0000 (-0600)
Subject: htmlform: Move HTMLSelectLanguageField into includes/htmlform/fields
X-Git-Tag: 1.34.0-rc.0~3037^2
X-Git-Url: http://git.cyclocoop.org/%22.%20generer_url_ecrire%28%22sites%22%2C%22%22%29.%20%22?a=commitdiff_plain;h=870831d40c9f64bf18f6897bbfa1310c972ff04d;p=lhc%2Fweb%2Fwiklou.git

htmlform: Move HTMLSelectLanguageField into includes/htmlform/fields

This was originally directly under includes/htmlform. This is
a specific type of field, so it should go here instead.

Follows-up d0c31ac988888764.

Change-Id: Iac196068ce2cbca063948bc78d21913482717d9a
---

diff --git a/autoload.php b/autoload.php
index afc187fd85..cc1182981c 100644
--- a/autoload.php
+++ b/autoload.php
@@ -604,7 +604,7 @@ $wgAutoloadLocalClasses = [
 	'HTMLRestrictionsField' => __DIR__ . '/includes/htmlform/fields/HTMLRestrictionsField.php',
 	'HTMLSelectAndOtherField' => __DIR__ . '/includes/htmlform/fields/HTMLSelectAndOtherField.php',
 	'HTMLSelectField' => __DIR__ . '/includes/htmlform/fields/HTMLSelectField.php',
-	'HTMLSelectLanguageField' => __DIR__ . '/includes/htmlform/HTMLSelectLanguageField.php',
+	'HTMLSelectLanguageField' => __DIR__ . '/includes/htmlform/fields/HTMLSelectLanguageField.php',
 	'HTMLSelectLimitField' => __DIR__ . '/includes/htmlform/fields/HTMLSelectLimitField.php',
 	'HTMLSelectNamespace' => __DIR__ . '/includes/htmlform/fields/HTMLSelectNamespace.php',
 	'HTMLSelectNamespaceWithButton' => __DIR__ . '/includes/htmlform/fields/HTMLSelectNamespaceWithButton.php',
diff --git a/includes/htmlform/HTMLSelectLanguageField.php b/includes/htmlform/HTMLSelectLanguageField.php
deleted file mode 100644
index 98cf3b19c4..0000000000
--- a/includes/htmlform/HTMLSelectLanguageField.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Language select field.
- */
-class HTMLSelectLanguageField extends HTMLSelectField {
-	public function __construct( $params ) {
-		parent::__construct( $params );
-
-		if ( $this->mParent instanceof HTMLForm ) {
-			$config = $this->mParent->getConfig();
-			$languageCode = $config->get( 'LanguageCode' );
-		} else {
-			global $wgLanguageCode;
-			$languageCode = $wgLanguageCode;
-		}
-
-		$languages = Language::fetchLanguageNames( null, 'mw' );
-
-		// Make sure the site language is in the list;
-		// a custom language code might not have a defined name…
-		if ( !array_key_exists( $languageCode, $languages ) ) {
-			$languages[$languageCode] = $languageCode;
-		}
-
-		ksort( $languages );
-
-		foreach ( $languages as $code => $name ) {
-			$this->mParams['options'][$code . ' - ' . $name] = $code;
-		}
-
-		if ( !array_key_exists( 'default', $params ) ) {
-			$this->mParams['default'] = $languageCode;
-		}
-	}
-}
diff --git a/includes/htmlform/fields/HTMLSelectLanguageField.php b/includes/htmlform/fields/HTMLSelectLanguageField.php
new file mode 100644
index 0000000000..98cf3b19c4
--- /dev/null
+++ b/includes/htmlform/fields/HTMLSelectLanguageField.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Language select field.
+ */
+class HTMLSelectLanguageField extends HTMLSelectField {
+	public function __construct( $params ) {
+		parent::__construct( $params );
+
+		if ( $this->mParent instanceof HTMLForm ) {
+			$config = $this->mParent->getConfig();
+			$languageCode = $config->get( 'LanguageCode' );
+		} else {
+			global $wgLanguageCode;
+			$languageCode = $wgLanguageCode;
+		}
+
+		$languages = Language::fetchLanguageNames( null, 'mw' );
+
+		// Make sure the site language is in the list;
+		// a custom language code might not have a defined name…
+		if ( !array_key_exists( $languageCode, $languages ) ) {
+			$languages[$languageCode] = $languageCode;
+		}
+
+		ksort( $languages );
+
+		foreach ( $languages as $code => $name ) {
+			$this->mParams['options'][$code . ' - ' . $name] = $code;
+		}
+
+		if ( !array_key_exists( 'default', $params ) ) {
+			$this->mParams['default'] = $languageCode;
+		}
+	}
+}