dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1c5deb4)
Drop remnants of wgHtml5/wgJsMimeType/wgXhtmlDefaultNamespace support, killed in...
authorJames D. Forrester <jforrester@wikimedia.org>
Fri, 12 Jul 2019 23:30:07 +0000 (16:30 -0700)
committerJames D. Forrester <jforrester@wikimedia.org>
Mon, 15 Jul 2019 19:52:12 +0000 (12:52 -0700)
Change-Id: I6bb849543fb3cfd50a4d99bb6a69e228913b9def

RELEASE-NOTES-1.34 patch | blob | history
includes/DefaultSettings.php patch | blob | history
includes/Setup.php patch | blob | history
includes/skins/SkinTemplate.php patch | blob | history
tests/parser/ParserTestRunner.php patch | blob | history

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index ac10762..44f69c7 100644 (file)
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -277,6 +277,10 @@ because of Phabricator reports.
   AuthChangeFormFields hook or security levels instead.
 * WikiMap::getWikiIdFromDomain(), deprecated in 1.33, has been removed.
   Use WikiMap::getWikiIdFromDbDomain() instead.
   AuthChangeFormFields hook or security levels instead.
 * WikiMap::getWikiIdFromDomain(), deprecated in 1.33, has been removed.
   Use WikiMap::getWikiIdFromDbDomain() instead.
+* The config variables $wgHtml5, $wgJsMimeType, and $wgXhtmlDefaultNamespace,
+  which were deprecated and ignored by core since 1.22, are no longer set to any
+  value, and SkinTemplate no longer emits a 'jsmimetype' key. Any extensions not
+  updated since 2013 to cope with this deprecation may now break.
 * …
 
 === Deprecations in 1.34 ===
 * …
 
 === Deprecations in 1.34 ===
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 5bf6163..3bfc8f8 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3277,33 +3277,6 @@ $wgOverrideUcfirstCharacters = [];
  */
 $wgMimeType = 'text/html';
 
  */
 $wgMimeType = 'text/html';
 
-/**
- * Previously used as content type in HTML script tags. This is now ignored since
- * HTML5 doesn't require a MIME type for script tags (javascript is the default).
- * It was also previously used by RawAction to determine the ctype query parameter
- * value that will result in a javascript response.
- * @deprecated since 1.22
- */
-$wgJsMimeType = null;
-
-/**
- * The default xmlns attribute. The option to define this has been removed.
- * The value of this variable is no longer used by core and is set to a fixed
- * value in Setup.php for compatibility with extensions that depend on the value
- * of this variable being set. Such a dependency however is deprecated.
- * @deprecated since 1.22
- */
-$wgXhtmlDefaultNamespace = null;
-
-/**
- * Previously used to determine if we should output an HTML5 doctype.
- * This is no longer used as we always output HTML5 now. For compatibility with
- * extensions that still check the value of this config it's value is now forced
- * to true by Setup.php.
- * @deprecated since 1.22
- */
-$wgHtml5 = true;
-
 /**
  * Defines the value of the version attribute in the &lt;html&gt; tag, if any.
  *
 /**
  * Defines the value of the version attribute in the &lt;html&gt; tag, if any.
  *
diff --git a/includes/Setup.php b/includes/Setup.php
index d6f390a..45a2456 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -585,12 +585,6 @@ if ( $wgUseFileCache || $wgUseCdn ) {
        $wgDebugToolbar = false;
 }
 
        $wgDebugToolbar = false;
 }
 
-// We always output HTML5 since 1.22, overriding these is no longer supported
-// we set them here for extensions that depend on its value.
-$wgHtml5 = true;
-$wgXhtmlDefaultNamespace = 'http://www.w3.org/1999/xhtml';
-$wgJsMimeType = 'text/javascript';
-
 // Blacklisted file extensions shouldn't appear on the "allowed" list
 $wgFileExtensions = array_values( array_diff( $wgFileExtensions, $wgFileBlacklist ) );
 
 // Blacklisted file extensions shouldn't appear on the "allowed" list
 $wgFileExtensions = array_values( array_diff( $wgFileExtensions, $wgFileBlacklist ) );
 
diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php
index 5d6197e..6ddced4 100644 (file)
--- a/includes/skins/SkinTemplate.php
+++ b/includes/skins/SkinTemplate.php
@@ -256,7 +256,7 @@ class SkinTemplate extends Skin {
         * @return QuickTemplate The template to be executed by outputPage
         */
        protected function prepareQuickTemplate() {
         * @return QuickTemplate The template to be executed by outputPage
         */
        protected function prepareQuickTemplate() {
-               global $wgScript, $wgStylePath, $wgMimeType, $wgJsMimeType,
+               global $wgScript, $wgStylePath, $wgMimeType,
                        $wgSitename, $wgLogo, $wgMaxCredits,
                        $wgShowCreditsIfMax, $wgArticlePath,
                        $wgScriptPath, $wgServer;
                        $wgSitename, $wgLogo, $wgMaxCredits,
                        $wgShowCreditsIfMax, $wgArticlePath,
                        $wgScriptPath, $wgServer;
@@ -306,7 +306,6 @@ class SkinTemplate extends Skin {
                }
 
                $tpl->set( 'mimetype', $wgMimeType );
                }
 
                $tpl->set( 'mimetype', $wgMimeType );
-               $tpl->set( 'jsmimetype', $wgJsMimeType );
                $tpl->set( 'charset', 'UTF-8' );
                $tpl->set( 'wgScript', $wgScript );
                $tpl->set( 'skinname', $this->skinname );
                $tpl->set( 'charset', 'UTF-8' );
                $tpl->set( 'wgScript', $wgScript );
                $tpl->set( 'skinname', $this->skinname );
diff --git a/tests/parser/ParserTestRunner.php b/tests/parser/ParserTestRunner.php
index f284b13..f29b0d7 100644 (file)
--- a/tests/parser/ParserTestRunner.php
+++ b/tests/parser/ParserTestRunner.php
@@ -279,7 +279,6 @@ class ParserTestRunner {
                $setup['wgNoFollowDomainExceptions'] = [ 'no-nofollow.org' ];
                $setup['wgExternalLinkTarget'] = false;
                $setup['wgLocaltimezone'] = 'UTC';
                $setup['wgNoFollowDomainExceptions'] = [ 'no-nofollow.org' ];
                $setup['wgExternalLinkTarget'] = false;
                $setup['wgLocaltimezone'] = 'UTC';
-               $setup['wgHtml5'] = true;
                $setup['wgDisableLangConversion'] = false;
                $setup['wgDisableTitleConversion'] = false;
 
                $setup['wgDisableLangConversion'] = false;
                $setup['wgDisableTitleConversion'] = false;
 
Wiklou, le Wiki du Wiklou