Merge "RELEASE-NOTES: Add note for StartProfiler deprecation"

diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32
index 5d426f1..941cf3f 100644 (file)
--- a/RELEASE-NOTES-1.32
+++ b/RELEASE-NOTES-1.32
@@ -43,7 +43,8 @@ changes to languages because of Phabricator reports.
 * …
 
 === Deprecations in 1.32 ===
-* …
+* Use of a StartProfiler.php file is deprecated in favour of placing
+  configuration in LocalSettings.php.
 
 === Other changes in 1.32 ===
 * …

diff --git a/includes/Setup.php b/includes/Setup.php
index ac47b6f..6513cdd 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -80,7 +80,7 @@ MediaWiki\HeaderCallback::register();
  */
 
 if ( is_readable( "$IP/StartProfiler.php" ) ) {
-       // @deprecated since 1.31: Use LocalSettings.php instead.
+       // @deprecated since 1.32: Use LocalSettings.php instead.
        require "$IP/StartProfiler.php";
 }