Merge "Remove support for StartProfiler.php"

diff --combined RELEASE-NOTES-1.32
index 1deca12,6f15d46..c765fc1
--- 1/RELEASE-NOTES-1.32
--- 2/RELEASE-NOTES-1.32
+++ b/RELEASE-NOTES-1.32
@@@ -40,8 -40,6 +40,8 @@@ production
  * The $wgPasswordSenderName setting, ignored since 1.23 by MediaWiki and almost
    all extensions, is no longer set at all. Instead, you can modify the system
    message `emailsender`.
 +* A new configuration setting, $wgRawHtmlMessages, is added, for listing
 +  messages which are displayed as raw HTML.
  
  === New features in 1.32 ===
  * (T112474) Generalized the ResourceLoader mechanism for overriding modules
@@@ -278,10 -276,10 +278,10 @@@ because of Phabricator reports
    a no-op function since 1.30.
  * SpecialPageFactory::resetList() is a no-op.  Call overrideMwServices()
    instead.
+ * MediaWiki no longer supports a StartProfiler.php file.
+   Define $wgProfiler via LocalSettings.php instead.
  
  === Deprecations in 1.32 ===
- * Use of a StartProfiler.php file is deprecated in favour of placing
-   configuration in LocalSettings.php.
  * HTMLForm::setSubmitProgressive() is deprecated. No need to call it. Submit
    button is already marked as progressive.
  * Skin::setupSkinUserCss() is deprecated. Adding of modules to load

diff --combined includes/DefaultSettings.php
index 2499077,5672a27..4ddc23e
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -4399,7 -4399,7 +4399,7 @@@ $wgPreprocessorCacheThreshold = 1000
  $wgEnableScaryTranscluding = false;
  
  /**
 - * Expiry time for transcluded templates cached in transcache database table.
 + * Expiry time for transcluded templates cached in object cache.
   * Only used $wgEnableInterwikiTranscluding is set to true.
   */
  $wgTranscludeCacheExpiry = 3600;
@@@ -6348,8 -6348,6 +6348,6 @@@ $wgDeprecationReleaseLimit = false
   * Profiler configuration.
   *
   * To use a profiler, set $wgProfiler in LocalSetings.php.
-  * For backwards-compatibility, it is also allowed to set the variable from
-  * a separate file called StartProfiler.php, which MediaWiki will include.
   *
   * Example:
   *
@@@ -8845,22 -8843,6 +8843,22 @@@ $wgCSPHeader = false
   */
  $wgCSPReportOnlyHeader = false;
  
 +/**
 + * List of messages which might contain raw HTML.
 + * Extensions should add their messages here. The list is used for access control:
 + * changing messages listed here will require editsitecss and editsitejs rights.
 + *
 + * @since 1.32
 + * @var string[]
 + */
 +$wgRawHtmlMessages = [
 +      'copyright',
 +      'history_copyright',
 +      'googlesearch',
 +      'feedback-terms',
 +      'feedback-termsofuse',
 +];
 +
  /**
   * Mapping of event channels (or channel categories) to EventRelayer configuration.
   *