Ori.livneh has submitted this change and it was merged.
Change subject: HHVM on beta: add MMV to disabled extensions
......................................................................
HHVM on beta: add MMV to disabled extensions
There's a bug that causes MMV to register a module with a null descriptor that
manifests only under HHVM. Fixed in change Ifc0a05362, but while waiting for
that, disable it on beta.
Change-Id: Ica79e1bfa588ef38df608d6aa4d2194965626795
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
2 files changed, 11 insertions(+), 4 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 83768fe..de00def 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -43,7 +43,14 @@
# ----------------------------------------------------------------------
# Initialisation
-$hhvm = defined( 'HHVM_VERSION' );
+# Extensions disabled when running under HHVM due to compatibility issues.
+if ( defined ( 'HHVM_VERSION' ) ) {
+ $wmgUseScribunto = false;
+ $wmgUseWikibaseRepo = false;
+ $wmgUseWikibaseClient = false;
+ $wmgUseMultimediaViewer = false;
+}
+
# Get the version object for this Wiki (must be set by now, along with $IP)
if ( !class_exists( 'MWMultiVersion' ) ) {
@@ -2350,7 +2357,7 @@
$wgCodeEditorEnableCore = $wmgUseCodeEditorForCore;
}
-if ( $wmgUseScribunto && !$hhvm ) {
+if ( $wmgUseScribunto ) {
include( "$IP/extensions/Scribunto/Scribunto.php" );
$wgScribuntoUseGeSHi = true;
$wgScribuntoUseCodeEditor = true;
@@ -2504,7 +2511,7 @@
// might be build as "aawikibooks" or something that does not have Wikibase.
$wgExtensionEntryPointListFiles[] =
"$IP/extensions/Wikidata/extension-list-wikidata";
-if ( ( $wmgUseWikibaseRepo || $wmgUseWikibaseClient ) && !$hhvm ) {
+if ( $wmgUseWikibaseRepo || $wmgUseWikibaseClient ) {
include( "$wmfConfigDir/Wikibase.php" );
}
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index 2fcdf2b..1e338e0 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -11,7 +11,7 @@
*/
/**
- * Main entry point to override production settings. Supports key beginning wit
+ * Main entry point to override production settings. Supports key beginning
with
* a dash to completely override a setting.
* Settings are fetched through wmfLabsSettings() defined below.
*/
--
To view, visit https://gerrit.wikimedia.org/r/124284
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ica79e1bfa588ef38df608d6aa4d2194965626795
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
