From 056628a8a56d5b42243289310a068662c835fc88 Mon Sep 17 00:00:00 2001
From: Robin Pepermans <robin@users.mediawiki.org>
Date: Mon, 5 Sep 2011 00:56:54 +0000
Subject: [PATCH] (bug 30679) Some installer fields should always be LTR Patch
 by Amir E. Aharoni (some whitespace fixes)

---
 CREDITS                                  | 1 +
 includes/installer/DatabaseInstaller.php | 4 ++--
 includes/installer/MysqlInstaller.php    | 4 ++--
 includes/installer/WebInstallerPage.php  | 2 ++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CREDITS b/CREDITS
index 4f19075f5c..5c64336fff 100644
--- a/CREDITS
+++ b/CREDITS
@@ -78,6 +78,7 @@ following names for their contribution to the product.
 * Ahmad Sherif
 * Alejandro Mery
 * Amalthea
+* Amir E. Aharoni
 * Antonio Ospite
 * Azliq7
 * Beau
diff --git a/includes/installer/DatabaseInstaller.php b/includes/installer/DatabaseInstaller.php
index aadd6b49e7..4e9e174fd5 100644
--- a/includes/installer/DatabaseInstaller.php
+++ b/includes/installer/DatabaseInstaller.php
@@ -462,8 +462,8 @@ abstract class DatabaseInstaller {
 		return
 			Html::openElement( 'fieldset' ) .
 			Html::element( 'legend', array(), wfMsg( 'config-db-install-account' ) ) .
-			$this->getTextBox( '_InstallUser', 'config-db-username', array(), $this->parent->getHelpBox( 'config-db-install-username' ) ) .
-			$this->getPasswordBox( '_InstallPassword', 'config-db-password', array(), $this->parent->getHelpBox( 'config-db-install-password' ) ) .
+			$this->getTextBox( '_InstallUser', 'config-db-username', array( 'dir' => 'ltr' ), $this->parent->getHelpBox( 'config-db-install-username' ) ) .
+			$this->getPasswordBox( '_InstallPassword', 'config-db-password', array( 'dir' => 'ltr' ), $this->parent->getHelpBox( 'config-db-install-password' ) ) .
 			Html::closeElement( 'fieldset' );
 	}
 
diff --git a/includes/installer/MysqlInstaller.php b/includes/installer/MysqlInstaller.php
index 3bb8c114e2..0d76e6d9fd 100644
--- a/includes/installer/MysqlInstaller.php
+++ b/includes/installer/MysqlInstaller.php
@@ -75,8 +75,8 @@ class MysqlInstaller extends DatabaseInstaller {
 			$this->getTextBox( 'wgDBserver', 'config-db-host', array(), $this->parent->getHelpBox( 'config-db-host-help' ) ) .
 			Html::openElement( 'fieldset' ) .
 			Html::element( 'legend', array(), wfMsg( 'config-db-wiki-settings' ) ) .
-			$this->getTextBox( 'wgDBname', 'config-db-name', array(), $this->parent->getHelpBox( 'config-db-name-help' ) ) .
-			$this->getTextBox( 'wgDBprefix', 'config-db-prefix', array(), $this->parent->getHelpBox( 'config-db-prefix-help' ) ) .
+			$this->getTextBox( 'wgDBname', 'config-db-name', array( 'dir' => 'ltr' ), $this->parent->getHelpBox( 'config-db-name-help' ) ) .
+			$this->getTextBox( 'wgDBprefix', 'config-db-prefix', array( 'dir' => 'ltr' ), $this->parent->getHelpBox( 'config-db-prefix-help' ) ) .
 			Html::closeElement( 'fieldset' ) .
 			$this->getInstallUserBox();
 	}
diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index 3da184d1b0..4d83991122 100644
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -894,12 +894,14 @@ class WebInstaller_Options extends WebInstallerPage {
 			$this->parent->getTextBox( array(
 				'var' => 'wgDeletedDirectory',
 				'label' => 'config-upload-deleted',
+				'attribs' => array( 'dir' => 'ltr' ),
 				'help' => $this->parent->getHelpBox( 'config-upload-deleted-help' )
 			) ) .
 			'</div>' .
 			$this->parent->getTextBox( array(
 				'var' => 'wgLogo',
 				'label' => 'config-logo',
+				'attribs' => array( 'dir' => 'ltr' ),
 				'help' => $this->parent->getHelpBox( 'config-logo-help' )
 			) )
 		);
-- 
2.20.1