From: Ori Livneh <ori@wikimedia.org>
Date: Sat, 8 Aug 2015 03:39:56 +0000 (-0700)
Subject: Remove redundant 'type' attributes from style and script tags
X-Git-Tag: 1.31.0-rc.0~8677^2
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=268da962915762265a1cfd4455550b980130da44;p=lhc%2Fweb%2Fwiklou.git

Remove redundant 'type' attributes from style and script tags

Already stripped by Html::element before actual output, but
remove them from the attribute arrays as well.

Change-Id: I8699ca7bf40df07e9d4c370f6863003c095ced0e
---

diff --git a/includes/Html.php b/includes/Html.php
index b7958dd4a0..5f91dacaba 100644
--- a/includes/Html.php
+++ b/includes/Html.php
@@ -359,8 +359,6 @@ class Html {
 			'keygen' => array( 'keytype' => 'rsa' ),
 			'link' => array( 'media' => 'all' ),
 			'menu' => array( 'type' => 'list' ),
-			// Note: the use of text/javascript here instead of other JavaScript
-			// MIME types follows the HTML5 spec.
 			'script' => array( 'type' => 'text/javascript' ),
 			'style' => array(
 				'media' => 'all',
@@ -674,7 +672,6 @@ class Html {
 		}
 
 		return self::rawElement( 'style', array(
-			'type' => 'text/css',
 			'media' => $media,
 		), $contents );
 	}
@@ -691,7 +688,6 @@ class Html {
 		return self::element( 'link', array(
 			'rel' => 'stylesheet',
 			'href' => $url,
-			'type' => 'text/css',
 			'media' => $media,
 		) );
 	}
diff --git a/includes/installer/MysqlInstaller.php b/includes/installer/MysqlInstaller.php
index e5c1a1db06..cbe51f5137 100644
--- a/includes/installer/MysqlInstaller.php
+++ b/includes/installer/MysqlInstaller.php
@@ -354,7 +354,7 @@ class MysqlInstaller extends DatabaseInstaller {
 		$s .= Xml::closeElement( 'div' );
 
 		if ( $this->getVar( '_MysqlEngine' ) != 'MyISAM' ) {
-			$s .= Xml::openElement( 'script', array( 'type' => 'text/javascript' ) );
+			$s .= Xml::openElement( 'script' );
 			$s .= '$(\'#dbMyisamWarning\').hide();';
 			$s .= Xml::closeElement( 'script' );
 		}
diff --git a/resources/src/mediawiki.legacy/wikibits.js b/resources/src/mediawiki.legacy/wikibits.js
index 7d1f6d73fd..38271a01d1 100644
--- a/resources/src/mediawiki.legacy/wikibits.js
+++ b/resources/src/mediawiki.legacy/wikibits.js
@@ -174,7 +174,6 @@
 		loadedScripts[ url ] = true;
 		var s = document.createElement( 'script' );
 		s.setAttribute( 'src', url );
-		s.setAttribute( 'type', 'text/javascript' );
 		document.getElementsByTagName( 'head' )[ 0 ].appendChild( s );
 		return s;
 	}