Alex Monk has submitted this change and it was merged.

Change subject: Cleanup deprecated MobileFrontend variables
......................................................................


Cleanup deprecated MobileFrontend variables

* Remove no longer used central notice and upload config variables
* Rename MF prefix to Minerva

Change-Id: Icb2f18c532f8e237df2c4d7d625647c4ea7eb1e0
---
M wmf-config/InitialiseSettings.php
M wmf-config/mobile.php
2 files changed, 1 insertion(+), 21 deletions(-)

Approvals:
  Alex Monk: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 53238ab..7b8fc72 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14438,9 +14438,6 @@
        'default' => NS_MAIN,
        'commonswiki' => NS_FILE,
 ],
-'wmgMFUseCentralAuthToken' => [
-       'default' => true,
-],
 'wmgMFNearby' => [
        'default' => true, // Does not gets enabled on wikis w/o GeoData anyway
 ],
@@ -14448,13 +14445,10 @@
        'default' => 'commonswiki',
        'test2wiki' => '',
 ],
-'wmgMFPhotoUploadAppendToDesc' => [
-       'default' => "{{Uploaded from 
Mobile|platform=Web|version=}}\n{{subst:unc}}",
-],
 'wmgMFEnableXAnalyticsLogging' => [
        'default' => true,
 ],
-'wmgMFEnableSiteNotice' => [
+'wgMinervaEnableSiteNotice' => [
        'default' => false,
 ],
 'wmgMFAppPackageId' => [
@@ -14480,10 +14474,6 @@
        'default' => true,
        'wiktionary' => false,
        'wikidata' => false,
-],
-'wmgMFUploadMinEdits' => [
-       'default' => 10,
-       'commonswiki' => 75, // T64598
 ],
 'wgMFUseWikibase' => [
        'default' => true,
diff --git a/wmf-config/mobile.php b/wmf-config/mobile.php
index 0bfffc4..aac7c30 100644
--- a/wmf-config/mobile.php
+++ b/wmf-config/mobile.php
@@ -9,10 +9,8 @@
        $wgMFNoindexPages = false;
        $wgMFNearby = $wmgMFNearby && $wmgEnableGeoData;
        $wgMFPhotoUploadEndpoint = $wmgMFPhotoUploadEndpoint;
-       $wgMFUseCentralAuthToken = $wmgMFUseCentralAuthToken;
        $wgMFPhotoUploadWiki = $wmgMFPhotoUploadWiki;
        $wgMFContentNamespace = $wmgMFContentNamespace;
-       $wgMFPhotoUploadAppendToDesc = $wmgMFPhotoUploadAppendToDesc;
        $wgMFMobileFormatterHeadings = $wmgMFMobileFormatterHeadings;
 
        if ( $wmgMobileFrontendLogo ) {
@@ -91,7 +89,6 @@
                return true;
        };
 
-       $wgMFEnableSiteNotice = $wmgMFEnableSiteNotice;
        $wgMFCollapseSectionsByDefault = $wmgMFCollapseSectionsByDefault;
        $wgMFTidyMobileViewSections = false; // experimental
 
@@ -99,13 +96,6 @@
        // They originally special-cased us but would like it done the normal 
way now. :)
        $wgMFAppPackageId = $wmgMFAppPackageId;
        $wgMFNearbyRange = $wmgMaxGeoSearchRadius;
-
-       // restrict access to mobile Uploads to users with minimum editcount 
T64598
-       $wgMFUploadMinEdits = $wmgMFUploadMinEdits;
-
-       // Disable mobile uploads per T64598
-       $wgGroupPermissions['autoconfirmed']['mf-uploadbutton'] = false;
-       $wgGroupPermissions['sysop']['mf-uploadbutton'] = false;
 
        $wgMFEnableBeta = true;
 

-- 
To view, visit https://gerrit.wikimedia.org/r/312339
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icb2f18c532f8e237df2c4d7d625647c4ea7eb1e0
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Alex Monk <a...@wikimedia.org>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
Gerrit-Reviewer: MaxSem <maxsem.w...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to