From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 14 Dec 2006 23:24:06 +0000 (+0000)
Subject: * (bug 8264) Fix JavaScript global vars for XHTML mode
X-Git-Tag: 1.31.0-rc.0~54896
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=6944909a8c7e052d5070516adaf6f33eaa44568d;p=lhc%2Fweb%2Fwiklou.git

* (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 d83fb48ffe..83449e07d2 100644
--- 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 0e415505a8..8a297e4fd8 100644
--- 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;
 	}