jenkins-bot has submitted this change and it was merged.
Change subject: Set default value for $wgSharedSchema
......................................................................
Set default value for $wgSharedSchema
Was added in I25df82065a307b9abc30c694f8c8afff0996d7c1 back in REL1_23
Change-Id: I291e770861751e037befe1db004e5e3f8b449f6c
---
M includes/DefaultSettings.php
M includes/Setup.php
2 files changed, 14 insertions(+), 0 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 4a35120..e822655 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1702,6 +1702,9 @@
* $wgSharedPrefix is the table prefix for the shared database. It defaults to
* $wgDBprefix.
*
+ * $wgSharedSchema is the table schema for the shared database. It defaults to
+ * $wgDBmwschema.
+ *
* @deprecated since 1.21 In new code, use the $wiki parameter to wfGetLB() to
* access remote databases. Using wfGetLB() allows the shared database to
* reside on separate servers to the wiki's own database, with suitable
@@ -1720,6 +1723,12 @@
$wgSharedTables = array( 'user', 'user_properties' );
/**
+ * @see $wgSharedDB
+ * @since 1.23
+ */
+$wgSharedSchema = false;
+
+/**
* Database load balancer
* This is a two-dimensional array, an array of server info structures
* Fields are:
diff --git a/includes/Setup.php b/includes/Setup.php
index 2faf196..f61de7e 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -306,6 +306,11 @@
$wgSharedPrefix = $wgDBprefix;
}
+// Set default shared schema
+if ( $wgSharedSchema === false ) {
+ $wgSharedSchema = $wgDBmwschema;
+}
+
if ( !$wgCookiePrefix ) {
if ( $wgSharedDB && $wgSharedPrefix && in_array( 'user',
$wgSharedTables ) ) {
$wgCookiePrefix = $wgSharedDB . '_' . $wgSharedPrefix;
--
To view, visit https://gerrit.wikimedia.org/r/173063
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I291e770861751e037befe1db004e5e3f8b449f6c
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Parent5446 <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: Skizzerz <[email protected]>
Gerrit-Reviewer: TTO <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
