X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Finstaller%2FMysqlInstaller.php;h=10f66925fa44efa1ef5f22dd4a1139444e9c1e2d;hb=9ec7cb086847a18de33df4931759f3cc4944fc38;hp=2d433244ae62a573dae78061dbebd54e31848d5e;hpb=b0b37fd95cd0e97fa5ceab0b0d1f5e2ce88b2b90;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/installer/MysqlInstaller.php b/includes/installer/MysqlInstaller.php
index 2d433244ae..10f66925fa 100644
--- a/includes/installer/MysqlInstaller.php
+++ b/includes/installer/MysqlInstaller.php
@@ -65,7 +65,7 @@ class MysqlInstaller extends DatabaseInstaller {
 	}
 
 	/**
-	 * @return Bool
+	 * @return bool
 	 */
 	public function isCompiled() {
 		return self::checkExtension( 'mysql' ) || self::checkExtension( 'mysqli' );
@@ -100,7 +100,9 @@ class MysqlInstaller extends DatabaseInstaller {
 
 	public function submitConnectForm() {
 		// Get variables from the request.
-		$newValues = $this->setVarsFromRequest( array( 'wgDBserver', 'wgDBname', 'wgDBprefix' ) );
+		$newValues = $this->setVarsFromRequest( array(
+			'wgDBserver', 'wgDBname', 'wgDBprefix', '_InstallUser', '_InstallPassword'
+		) );
 
 		// Validate them.
 		$status = Status::newGood();
@@ -115,6 +117,12 @@ class MysqlInstaller extends DatabaseInstaller {
 		if ( !preg_match( '/^[a-z0-9_-]*$/i', $newValues['wgDBprefix'] ) ) {
 			$status->fatal( 'config-invalid-db-prefix', $newValues['wgDBprefix'] );
 		}
+		if ( !strlen( $newValues['_InstallUser'] ) ) {
+			$status->fatal( 'config-db-username-empty' );
+		}
+		if (!strlen( $newValues['_InstallPassword'] ) ) {
+			$status->fatal( 'config-db-password-empty', $newValues['_InstallUser'] );
+		}
 		if ( !$status->isOK() ) {
 			return $status;
 		}
@@ -595,7 +603,7 @@ class MysqlInstaller extends DatabaseInstaller {
 	 * Return a formal 'User'@'Host' username for use in queries
 	 * @param string $name Username, quotes will be added
 	 * @param string $host Hostname, quotes will be added
-	 * @return String
+	 * @return string
 	 */
 	private function buildFullUserName( $name, $host ) {
 		return $this->db->addQuotes( $name ) . '@' . $this->db->addQuotes( $host );
@@ -606,7 +614,7 @@ class MysqlInstaller extends DatabaseInstaller {
 	 * access to mysql.user, so false means "no" or "maybe"
 	 * @param string $host Hostname to check
 	 * @param string $user Username to check
-	 * @return boolean
+	 * @return bool
 	 */
 	private function userDefinitelyExists( $host, $user ) {
 		try {
@@ -623,7 +631,7 @@ class MysqlInstaller extends DatabaseInstaller {
 	 * Return any table options to be applied to all tables that don't
 	 * override them.
 	 *
-	 * @return String
+	 * @return string
 	 */
 	protected function getTableOptions() {
 		$options = array();