From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 7 Aug 2019 23:14:36 +0000 (-0700)
Subject: DefaultSettings.php: Move $wgDBname/$wgDBprefix/$wgDBmwschema closer to each other
X-Git-Tag: 1.34.0-rc.0~654^2
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=be49e9923f70d7e50c22b610fc204a2146c5a0b1;p=lhc%2Fweb%2Fwiklou.git

DefaultSettings.php: Move $wgDBname/$wgDBprefix/$wgDBmwschema closer to each other

Change-Id: I33e55a8547beade94157c1cdf941677d29ae5869
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index f2446da40b..98ffe71249 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1887,6 +1887,36 @@ $wgUsersNotifiedOnAllChanges = [];
  * @{
  */
 
+/**
+ * Current wiki database name
+ *
+ * Should be alphanumeric, without spaces nor hyphens.
+ * This is used to determine the current/local wiki ID (WikiMap::getCurrentWikiDbDomain).
+ *
+ * This should still be set even if $wgLBFactoryConf is configured.
+ */
+$wgDBname = 'my_wiki';
+
+/**
+ * Current wiki database schema name
+ *
+ * Should be alphanumeric, without spaces nor hyphens.
+ * This is used to determine the current/local wiki ID (WikiMap::getCurrentWikiDbDomain).
+ *
+ * This should still be set even if $wgLBFactoryConf is configured.
+ */
+$wgDBmwschema = null;
+
+/**
+ * Current wiki database table name prefix
+ *
+ * Should be alphanumeric, without spaces nor hyphens, preferably ending in an underscore.
+ * This is used to determine the current/local wiki ID (WikiMap::getCurrentWikiDbDomain).
+ *
+ * This should still be set even if $wgLBFactoryConf is configured.
+ */
+$wgDBprefix = '';
+
 /**
  * Database host name or IP address
  */
@@ -1897,11 +1927,6 @@ $wgDBserver = 'localhost';
  */
 $wgDBport = 5432;
 
-/**
- * Name of the database; this should be alphanumeric and not contain spaces nor hyphens
- */
-$wgDBname = 'my_wiki';
-
 /**
  * Database username
  */
@@ -1964,13 +1989,6 @@ $wgSearchType = null;
  */
 $wgSearchTypeAlternatives = null;
 
-/**
- * Table name prefix.
- * Should be alphanumeric plus underscores, and not contain spaces nor hyphens.
- * Suggested format ends with an underscore.
- */
-$wgDBprefix = '';
-
 /**
  * MySQL table options to use during installation or update
  */
@@ -1984,11 +2002,6 @@ $wgDBTableOptions = 'ENGINE=InnoDB, DEFAULT CHARSET=binary';
  */
 $wgSQLMode = '';
 
-/**
- * Mediawiki schema; this should be alphanumeric and not contain spaces nor hyphens
- */
-$wgDBmwschema = null;
-
 /**
  * Default group to use when getting database connections.
  * Will be used as default query group in ILoadBalancer::getConnection.