Merge "Trim $dbSupport in WebInstallerPage.php"

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 18d3773..98abb96 100644 (file)
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -525,31 +525,7 @@ $wgAutoloadLocalClasses = array(
        'ExternalUser_MediaWiki' => 'includes/extauth/MediaWiki.php',
        'ExternalUser_vB' => 'includes/extauth/vB.php',
 
-       # includes/filerepo
-       'FileRepo' => 'includes/filerepo/FileRepo.php',
-       'FileRepoStatus' => 'includes/filerepo/FileRepoStatus.php',
-       'ForeignAPIRepo' => 'includes/filerepo/ForeignAPIRepo.php',
-       'ForeignDBRepo' => 'includes/filerepo/ForeignDBRepo.php',
-       'ForeignDBViaLBRepo' => 'includes/filerepo/ForeignDBViaLBRepo.php',
-       'FSRepo' => 'includes/filerepo/FSRepo.php',
-       'LocalRepo' => 'includes/filerepo/LocalRepo.php',
-       'NullRepo' => 'includes/filerepo/NullRepo.php',
-       'RepoGroup' => 'includes/filerepo/RepoGroup.php',
-       'TempFileRepo' => 'includes/filerepo/FileRepo.php',
-
-       # includes/filerepo/file
-       'ArchivedFile' => 'includes/filerepo/file/ArchivedFile.php',
-       'File' => 'includes/filerepo/file/File.php',
-       'ForeignAPIFile' => 'includes/filerepo/file/ForeignAPIFile.php',
-       'ForeignDBFile' => 'includes/filerepo/file/ForeignDBFile.php',
-       'LocalFile' => 'includes/filerepo/file/LocalFile.php',
-       'LocalFileDeleteBatch' => 'includes/filerepo/file/LocalFile.php',
-       'LocalFileMoveBatch' => 'includes/filerepo/file/LocalFile.php',
-       'LocalFileRestoreBatch' => 'includes/filerepo/file/LocalFile.php',
-       'OldLocalFile' => 'includes/filerepo/file/OldLocalFile.php',
-       'UnregisteredLocalFile' => 'includes/filerepo/file/UnregisteredLocalFile.php',
-
-       # includes/filerepo/backend
+       # includes/filebackend
        'FileBackendGroup' => 'includes/filebackend/FileBackendGroup.php',
        'FileBackend' => 'includes/filebackend/FileBackend.php',
        'FileBackendStore' => 'includes/filebackend/FileBackendStore.php',
@@ -593,6 +569,30 @@ $wgAutoloadLocalClasses = array(
        'CreateFileOp' => 'includes/filebackend/FileOp.php',
        'NullFileOp' => 'includes/filebackend/FileOp.php',
 
+       # includes/filerepo
+       'FileRepo' => 'includes/filerepo/FileRepo.php',
+       'FileRepoStatus' => 'includes/filerepo/FileRepoStatus.php',
+       'ForeignAPIRepo' => 'includes/filerepo/ForeignAPIRepo.php',
+       'ForeignDBRepo' => 'includes/filerepo/ForeignDBRepo.php',
+       'ForeignDBViaLBRepo' => 'includes/filerepo/ForeignDBViaLBRepo.php',
+       'FSRepo' => 'includes/filerepo/FSRepo.php',
+       'LocalRepo' => 'includes/filerepo/LocalRepo.php',
+       'NullRepo' => 'includes/filerepo/NullRepo.php',
+       'RepoGroup' => 'includes/filerepo/RepoGroup.php',
+       'TempFileRepo' => 'includes/filerepo/FileRepo.php',
+
+       # includes/filerepo/file
+       'ArchivedFile' => 'includes/filerepo/file/ArchivedFile.php',
+       'File' => 'includes/filerepo/file/File.php',
+       'ForeignAPIFile' => 'includes/filerepo/file/ForeignAPIFile.php',
+       'ForeignDBFile' => 'includes/filerepo/file/ForeignDBFile.php',
+       'LocalFile' => 'includes/filerepo/file/LocalFile.php',
+       'LocalFileDeleteBatch' => 'includes/filerepo/file/LocalFile.php',
+       'LocalFileMoveBatch' => 'includes/filerepo/file/LocalFile.php',
+       'LocalFileRestoreBatch' => 'includes/filerepo/file/LocalFile.php',
+       'OldLocalFile' => 'includes/filerepo/file/OldLocalFile.php',
+       'UnregisteredLocalFile' => 'includes/filerepo/file/UnregisteredLocalFile.php',
+
        # includes/installer
        'CliInstaller' => 'includes/installer/CliInstaller.php',
        'DatabaseInstaller' => 'includes/installer/DatabaseInstaller.php',

diff --git a/includes/installer/Installer.i18n.php b/includes/installer/Installer.i18n.php
index e722893..a107cec 100644 (file)
--- a/includes/installer/Installer.i18n.php
+++ b/includes/installer/Installer.i18n.php
@@ -627,6 +627,8 @@ Add dir="ltr" to the <nowiki><code></nowiki> for right-to-left languages.',
        'config-type-postgres' => '{{optional}}',
        'config-type-sqlite' => '{{optional}}',
        'config-type-oracle' => '{{optional}}',
+       'config-support-info' => 'Parameters:
+* $1 - a list of DBMSs that MediaWiki supports, composed with other config-type-* and config-support-* messages.',
        'config-support-mysql' => 'Parameters:
 * $1 - a link to the MySQL home page having the anchor text "MySQL".',
        'config-support-postgres' => 'Parameters: