r80083 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r80082‎ | r80083 | r80084 >
Date:09:59, 12 January 2011
Author:demon
Status:ok
Tags:
Comment:
(bug 26688) Proper warning message is not displayed for the blank 'Database host'
Modified paths:
  • /trunk/phase3/includes/installer/Installer.i18n.php (modified) (history)
  • /trunk/phase3/includes/installer/MysqlInstaller.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/installer/Installer.i18n.php
@@ -230,6 +230,7 @@
231231 'config-header-oracle' => 'Oracle settings',
232232 'config-invalid-db-type' => 'Invalid database type',
233233 'config-missing-db-name' => 'You must enter a value for "Database name"',
 234+ 'config-missing-db-host' => 'You must enter a value for "Database host"',
234235 'config-missing-db-server-oracle' => 'You must enter a value for "Database TNS"',
235236 'config-invalid-db-server-oracle' => 'Invalid database TNS "$1".
236237 Use only ASCII letters (a-z, A-Z), numbers (0-9), underscores (_) and dots (.).',
Index: trunk/phase3/includes/installer/MysqlInstaller.php
@@ -74,6 +74,9 @@
7575
7676 // Validate them.
7777 $status = Status::newGood();
 78+ if ( !strlen( $newValues['wgDBserver'] ) ) {
 79+ $status->fatal( 'config-missing-db-host' );
 80+ }
7881 if ( !strlen( $newValues['wgDBname'] ) ) {
7982 $status->fatal( 'config-missing-db-name' );
8083 } elseif ( !preg_match( '/^[a-z0-9_-]+$/i', $newValues['wgDBname'] ) ) {

Follow-up revisions

RevisionCommit summaryAuthorDate
r81182MFT a bunch of installer fixes. r80238, r80128, r80124, r80083, r80080, r800...demon01:59, 29 January 2011

Status & tagging log