Merge "upload: Simplify file extension extraction in UploadBase"

[lhc/web/wiklou.git] / includes / preferences / DefaultPreferencesFactory.php

diff --git a/includes/preferences/DefaultPreferencesFactory.php b/includes/preferences/DefaultPreferencesFactory.php
index a42726f..b2f5342 100644 (file)
--- a/includes/preferences/DefaultPreferencesFactory.php
+++ b/includes/preferences/DefaultPreferencesFactory.php
@@ -870,6 +870,17 @@ class DefaultPreferencesFactory implements PreferencesFactory {
                                'section' => 'rendering/advancedrendering',
                                'label-message' => 'tog-showrollbackconfirmation',
                        ];
+
+                       /**
+                        * FIXME
+                        * Remove temporary help text and references to DisableRollbackConfirmationFeature
+                        * after release of rollback feature. See T199534
+                        */
+                       if ( MediaWikiServices::getInstance()
+                               ->getMainConfig()->get( 'DisableRollbackConfirmationFeature' ) ) {
+                               $defaultPreferences['showrollbackconfirmation']
+                               ['help-message'] = 'tog-showrollbackconfirmation-prerelease-warning';
+                       }
                }
        }