Merge "Avoid "CAS updated failed" errors on Special:Preferences double post"

diff --git a/includes/Html.php b/includes/Html.php
index b7958dd..5f91dac 100644 (file)
--- 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 e5c1a1d..cbe51f5 100644 (file)
--- 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 7d1f6d7..38271a0 100644 (file)
--- 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;
        }