Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55235
Change subject: Remove temporary workaround for E3 entry-point migration
......................................................................
Remove temporary workaround for E3 entry-point migration
This removes the if/else inclusion of either E3Experiments.php or
Experiments.php as the entry point for the E3Experiments extension which I had
put in place in I01deec11b to facilitate a smooth migration from the latter to
the former.
Change-Id: I95bc0d850b297bcfde2bf7265bb09e0854a63773
---
M wmf-config/CommonSettings.php
M wmf-config/extension-list
2 files changed, 2 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/35/55235/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index f490102..aca54a2 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2479,11 +2479,7 @@
}
if ( $wmgUseE3Experiments ) {
- if ( file_exists( "$IP/extensions/E3Experiments/E3Experiments.php" ) ) {
- include_once( "$IP/extensions/E3Experiments/E3Experiments.php"
);
- } else {
- include_once( "$IP/extensions/E3Experiments/Experiments.php" );
- }
+ include_once( "$IP/extensions/E3Experiments/E3Experiments.php" );
}
if ( $wmgEnableGeoData ) {
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 45a00e1..0aa1674 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -41,7 +41,7 @@
$IP/extensions/DismissableSiteNotice/DismissableSiteNotice.php
$IP/extensions/DonationInterface/donationinterface_langonly.php
$IP/extensions/DoubleWiki/DoubleWiki.php
-$IP/extensions/E3Experiments/Experiments.php
+$IP/extensions/E3Experiments/E3Experiments.php
$IP/extensions/Echo/Echo.php
$IP/extensions/EditPageTracking/EditPageTracking.php
$IP/extensions/EducationProgram/EducationProgram.php
--
To view, visit https://gerrit.wikimedia.org/r/55235
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I95bc0d850b297bcfde2bf7265bb09e0854a63773
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
