Merge "Deprecate $wgContentHandlerUseDB"

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index 076f2f5..09195e1 100644 (file)
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -562,6 +562,7 @@ because of Phabricator reports.
   system block that hides the user.
 * The GetBlockedStatus hook is deprecated. Use GetUserBlock instead, to add or
   remove a block.
+* $wgContentHandlerUseDB is deprecated and should always be true.
 
 === Other changes in 1.34 ===
 * …

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index c9bed29..47fd073 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -8619,6 +8619,7 @@ $wgContentHandlerTextFallback = 'ignore';
  * handling is less robust and less flexible.
  *
  * @since 1.21
+ * @deprecated since 1.34, and should always be set true.
  */
 $wgContentHandlerUseDB = true;