* (bug 8264) Fix JavaScript global vars for XHTML mode

Don't use <!-- --> to wrap JavaScript code!
This ACTUALLY MAKES THE CODE DISAPPEAR when using an XML parser.
Instead, wrapped in /*<![CDATA[*/ /*]]>*/ to ensure XML compatibility for contents.

We've long since given up on super-ancient browsers that don't
know about <script>; they're so old you can't even use name-based
virtual hosts so why bother? ;)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d83fb48..83449e0 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -319,6 +319,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * User::getOption now accept a default value to override default user values
   this makes it consistent with WebRequest::get* methods. Corrected code in
   various places accordingly.
+* (bug 8264) Fix JavaScript global vars for XHTML mode
 
 
 == Languages updated ==

diff --git a/includes/Skin.php b/includes/Skin.php
index 0e41550..8a297e4 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -272,12 +272,12 @@ class Skin extends Linker {
        static function makeVariablesScript( $data ) {
                global $wgJsMimeType;
 
-               $r = "<script type= \"$wgJsMimeType\"><!--\n";
+               $r = "<script type= \"$wgJsMimeType\">/*<![CDATA[*/\n";
                foreach ( $data as $name => $value ) {
                        $encValue = Xml::encodeJsVar( $value );
                        $r .= "var $name = $encValue;\n";
                }
-               $r .= "--></script>\n";
+               $r .= "/*]]>*/</script>\n";
 
                return $r;
        }