From: Gabriel Wicke <gwicke@users.mediawiki.org>
Date: Fri, 9 Apr 2004 15:15:11 +0000 (+0000)
Subject: always protect js with cdata enclosed in /* */- doesn't harm for html, helps to valid... 
X-Git-Tag: 1.3.0beta1~520
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=c7c6f173ed393591207aec96656a46c9b9f40a09;p=lhc%2Fweb%2Fwiklou.git

always protect js with cdata enclosed in /* */- doesn't harm for html, helps to validate xhtml (which has to be text/html currently because browsers choke otherwise)
---

diff --git a/includes/Skin.php b/includes/Skin.php
index 93fc975a97..71becedd05 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -2468,13 +2468,8 @@ class Skin {
 				"key"=>"R"
 				)
 		);
-		$toolbar ="<script type='text/javascript'>\n";
-
-		$xml = ($wgMimeType == "text/xml");
-		if( $xml ) {
-			$toolbar .= "<![CDATA[";
-		}
-
+		$toolbar ="<script type='text/javascript'>\n/*<![CDATA[*/\n";
+		
 		$toolbar.="document.writeln(\"<div id='toolbar' tabindex='4000000'>\");\n";
 		foreach($toolarray as $tool) {
 
@@ -2496,11 +2491,8 @@ class Skin {
 
 		$toolbar.="addInfobox('" . addslashes( wfMsg( "infobox" ) ) . "','" . addslashes(wfMsg("infobox_alert")) . "');\n";
 		$toolbar.="document.writeln(\"</div>\");\n";
-
-		if( $xml ) {
-			$toolbar .= "]]>";
-		}
-		$toolbar.="</script>";
+		
+		$toolbar.="/*]]>*/</script>";
 		return $toolbar;
 	}
 }