Set default fragment mode to [ 'legacy', 'html5' ]

This is step one in migration, 1.35 LTS should make it
[ 'html5', 'legacy' ].

Also issue deprecation warnings for $wgExperimentalHtmlIds.

Bug: T152540
Bug: T139744
Change-Id: I8780bb589002a4f836ba90bd18093a56cddc3ddf

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index dd00228..1008b05 100644 (file)
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -21,6 +21,9 @@ production.
   were removed (deprecated since 1.27).
 * (T180921) $wgReferrerPolicy now supports having fallbacks for browsers that are not
   using the latest version of the Referrer Policy specification.
+* $wgFragmentMode is now set to [ 'legacy', 'html5' ] by default. This is a first step of
+  migration to human-readable section IDs that will later result in 'html5' being the
+  default mode.
 
 === New features in 1.31 ===
 * Wikimedia\Rdbms\IDatabase->select() and similar methods now support

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 9208dec..8f4c346 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3411,7 +3411,7 @@ $wgExperimentalHtmlIds = false;
  *
  * @since 1.30
  */
-$wgFragmentMode = [ 'legacy' ];
+$wgFragmentMode = [ 'legacy', 'html5' ];
 
 /**
  * Which ID escaping mode should be used for external interwiki links? See documentation

diff --git a/includes/Setup.php b/includes/Setup.php
index d1f225b..3e37c9c 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -360,6 +360,7 @@ unset( $repo ); // no global pollution; destroy reference
 
 // Convert this deprecated setting to modern system
 if ( $wgExperimentalHtmlIds ) {
+       wfDeprecated( '$wgExperimentalHtmlIds', '1.30' );
        $wgFragmentMode = [ 'html5-legacy', 'html5' ];
 }