jenkins-bot has submitted this change and it was merged.
Change subject: Enable ElectronPdfService extension on test wikis &
mediawikiwiki
......................................................................
Enable ElectronPdfService extension on test wikis & mediawikiwiki
Bug: T150944
Change-Id: I3ec52bbcd3fd01e32bbf7e81bddccd6d8aa32edb
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
3 files changed, 11 insertions(+), 4 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index 0c39c43..dde7c8d 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -257,10 +257,6 @@
$wgCollectionCommandToServeURL[ 'zip_post' ] =
'https://pediapress.com/wmfup/';
}
-if ( $wmgUseElectronPdfService ) {
- wfLoadExtension( 'ElectronPdfService' );
-}
-
if ( $wmgUsePageImages ) {
require_once "$IP/extensions/PageImages/PageImages.php";
$wgPageImagesExpandOpenSearchXml = $wmgPageImagesExpandOpenSearchXml;
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 2e311e6..887cded 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1796,6 +1796,10 @@
$wgCollectionPortletFormats = $wmgCollectionPortletFormats;
}
+if ( $wmgUseElectronPdfService ) {
+ wfLoadExtension( 'ElectronPdfService' );
+}
+
# Various system to allow/prevent flooding
# (including exemptions for scheduled outreach events)
require( "$wmfConfigDir/throttle.php" );
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index d81235e..fbbabdd 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12045,6 +12045,13 @@
// ta/gu/ml/ne/ur (T39154, T39384, T39672, T39374, T43714).
],
+'wmgUseElectronPdfService' => [
+ 'default' => false,
+ 'testwiki' => true, // T150944
+ 'test2wiki' => true, // T150944
+ 'mediawikiwiki' => true, // T150944
+],
+
'wmgUseSpamBlacklist' => [
'default' => true,
'private' => false,
--
To view, visit https://gerrit.wikimedia.org/r/324487
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3ec52bbcd3fd01e32bbf7e81bddccd6d8aa32edb
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
