jenkins-bot has submitted this change and it was merged.
Change subject: Add b/c for the $wgEchoConfig -> $wgEchoEventLoggingSchema
rename in I2f9d5d111f
......................................................................
Add b/c for the $wgEchoConfig -> $wgEchoEventLoggingSchema rename in I2f9d5d111f
Change-Id: I544f37dd5d89a1abe8a3e86740e69e2a2157ffe3
---
M wmf-config/CommonSettings.php
1 file changed, 9 insertions(+), 4 deletions(-)
Approvals:
Thcipriani: Looks good to me, approved
Legoktm: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index ab0e3b9..4bf2aee 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2624,10 +2624,15 @@
if ( $wmgUseEcho ) {
require_once( "$IP/extensions/Echo/Echo.php" );
- // Eventlogging for Schema:EchoMail
- $wgEchoConfig['eventlogging']['EchoMail']['enabled'] = true;
- // Eventlogging for Schema:EchoInteraction
- $wgEchoConfig['eventlogging']['EchoInteraction']['enabled'] = true;
+ if ( isset( $wgEchoConfig ) ) {
+ // Eventlogging for Schema:EchoMail
+ $wgEchoConfig['eventlogging']['EchoMail']['enabled'] = true;
+ // Eventlogging for Schema:EchoInteraction
+ $wgEchoConfig['eventlogging']['EchoInteraction']['enabled'] =
true;
+ } else {
+ $wgEchoEventLoggingSchemas['EchoMail']['enabled'] = true;
+ $wgEchoEventLoggingSchemas['EchoInteraction']['enabled'] = true;
+ }
$wgEchoEnableEmailBatch = $wmgEchoEnableEmailBatch;
$wgEchoEmailFooterAddress = $wmgEchoEmailFooterAddress;
--
To view, visit https://gerrit.wikimedia.org/r/324792
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I544f37dd5d89a1abe8a3e86740e69e2a2157ffe3
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Thcipriani <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
