Require $wgHtml5 for $wgExperimentalHtmlIds

This way, if you want to disable HTML5 you don't have to turn off an
extra setting to maintain validity.

diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index 8f45cfd..9dd648c 100644 (file)
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -877,10 +877,10 @@ class Sanitizer {
         * @return String
         */
        static function escapeId( $id, $options = array() ) {
-               global $wgExperimentalHtmlIds;
+               global $wgHtml5, $wgExperimentalHtmlIds;
                $options = (array)$options;
 
-               if ( $wgExperimentalHtmlIds && !in_array( 'legacy', $options ) ) {
+               if ( $wgHtml5 && $wgExperimentalHtmlIds && !in_array( 'legacy', $options ) ) {
                        $id = preg_replace( '/[ \t\n\r\f_\'"&]+/', '_', $id );
                        $id = trim( $id, '_' );
                        if ( $id === '' ) {

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index e5e92e0..8fb333c 100644 (file)
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -3485,7 +3485,7 @@ class Parser
         * @private
         */
        function formatHeadings( $text, $origText, $isMain=true ) {
-               global $wgMaxTocLevel, $wgContLang, $wgExperimentalHtmlIds;
+               global $wgMaxTocLevel, $wgContLang, $wgHtml5, $wgExperimentalHtmlIds;
 
                $doNumberHeadings = $this->mOptions->getNumberHeadings();
                $showEditLink = $this->mOptions->getEditSection();
@@ -3661,7 +3661,7 @@ class Parser
                        # Save headline for section edit hint before it's escaped
                        $headlineHint = $safeHeadline;
 
-                       if ( $wgExperimentalHtmlIds ) {
+                       if ( $wgHtml5 && $wgExperimentalHtmlIds ) {
                                # For reverse compatibility, provide an id that's
                                # HTML4-compatible, like we used to.
                                #