Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/154396
Change subject: Disable MediaViewer by default for logged-in users on Commons ...................................................................... Disable MediaViewer by default for logged-in users on Commons Soft-depends on Ief0df5b4f4285d99208f007b0510a396f6c272e0 Bug: 69363 Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/822 Change-Id: I90f6ab5b44fbcde0b89f56e795f69472c4940854 --- 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, 13 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/96/154396/1 diff --git a/wmf-config/CommonSettings-labs.php b/wmf-config/CommonSettings-labs.php index 77bbc30..7ac474b 100644 --- a/wmf-config/CommonSettings-labs.php +++ b/wmf-config/CommonSettings-labs.php @@ -70,10 +70,6 @@ if ( $wmgMediaViewerBeta ) { $wgMediaViewerIsInBeta = true; } - - if ( $wmgMediaViewerLoggedIn ) { - $wgEnableMediaViewerForLoggedInUsersOnly = true; - } } if ( $wmgUseVectorBeta ) { diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 5d8b352..dfae5ec 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -1887,8 +1887,12 @@ $wgMediaViewerIsInBeta = true; } - if ( $wmgMediaViewerLoggedIn ) { - $wgEnableMediaViewerForLoggedInUsersOnly = true; + if ( isset( $wmgMediaViewerEnableByDefault ) ) { + $wgMediaViewerEnableByDefault = $wmgMediaViewerEnableByDefault; + } + + if ( isset( $wmgMediaViewerEnableByDefaultForAnonymous ) ) { + $wgMediaViewerEnableByDefaultForAnonymous = $wmgMediaViewerEnableByDefaultForAnonymous; } if ( $wmgMediaViewerUseThumbnailGuessing ) { diff --git a/wmf-config/InitialiseSettings-labs.php b/wmf-config/InitialiseSettings-labs.php index 4af1918..6b61afe 100644 --- a/wmf-config/InitialiseSettings-labs.php +++ b/wmf-config/InitialiseSettings-labs.php @@ -299,10 +299,6 @@ 'enwiktionary' => true, ), - 'wmgMediaViewerLoggedIn' => array( - 'default' => false, - ), - 'wmgNetworkPerformanceSamplingFactor' => array( 'default' => 1, ), diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 5008b22..276b5ce 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10888,8 +10888,13 @@ 'default' => false, ), -'wmgMediaViewerLoggedIn' => array( - 'default' => false, +'wmgMediaViewerEnableByDefault' => array( + 'default' => true, + 'commonswiki' => false, // bug 69363 +), + +'wmgMediaViewerEnableByDefaultForAnonymous' => array( + 'default' => true, ), 'wmgMediaViewerUseThumbnailGuessing' => array( -- To view, visit https://gerrit.wikimedia.org/r/154396 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I90f6ab5b44fbcde0b89f56e795f69472c4940854 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Gergő Tisza <gti...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
