jenkins-bot has submitted this change and it was merged.
Change subject: Revert "Enable UploadsLink at Wikimedia Commons"
......................................................................
Revert "Enable UploadsLink at Wikimedia Commons"
Undefined variable: wmgUseUploadsLink
in /srv/mediawiki/wmf-config/CommonSettings.php on line 827
This reverts commit 7e1cd07dba434c0a433672a2da97b5224d3aaecd.
Change-Id: Ie3cc7810142a805b382123593e30cda3ac4c3087
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
4 files changed, 9 insertions(+), 9 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index e4664a1..c4d404b 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -134,6 +134,10 @@
$wgGlobalUserPageDBname = 'metawiki';
}
+if ( $wmgUseUploadsLink ) {
+ wfLoadExtension( 'UploadsLink' );
+}
+
if ( $wmgUseUrlShortener ) {
// Labs overrides
$wgUrlShortenerReadOnly = false;
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index d783a1d..33efe42 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -824,10 +824,6 @@
$wgFFmpegLocation = '/usr/bin/ffmpeg';
}
-if ( $wmgUseUploadsLink ) {
- wfLoadExtension( 'UploadsLink' );
-}
-
if ( $wmgUseUrlShortener ) {
wfLoadExtension( 'UrlShortener' );
$wgUrlShortenerTemplate = '/$1';
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index d7fdc2d..aba9191 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -577,6 +577,11 @@
'default' => false, // T69651
],
+ 'wmgUseUploadsLink' => [
+ 'default' => false,
+ 'commonswiki' => true,
+ ],
+
'wmgUseUrlShortener' => [
'default' => true,
'private' => false,
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 8ab0d23..bd1a21a 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12480,11 +12480,6 @@
'default' => 800,
],
-'wmgUseUploadsLink' => [
- 'default' => false,
- 'commonswiki' => true,
-],
-
'wmgUseUrlShortener' => [
'default' => true,
'private' => false,
--
To view, visit https://gerrit.wikimedia.org/r/286941
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3cc7810142a805b382123593e30cda3ac4c3087
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
