From: Tim Starling <tstarling@users.mediawiki.org>
Date: Mon, 20 Mar 2006 08:37:00 +0000 (+0000)
Subject: paranoid template escaping, fixing broken include directory when symlinked
X-Git-Tag: 1.6.0~180
X-Git-Url: http://git.cyclocoop.org/geomaker.php?a=commitdiff_plain;h=c2daf10c6b26b828e6ea0795744c0cf99a94bc86;p=lhc%2Fweb%2Fwiklou.git

paranoid template escaping, fixing broken include directory when symlinked
---

diff --git a/skins/disabled/MonoBookCBT.php b/skins/disabled/MonoBookCBT.php
index 5d05e15119..82db2686d6 100644
--- a/skins/disabled/MonoBookCBT.php
+++ b/skins/disabled/MonoBookCBT.php
@@ -4,10 +4,9 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 	die( "This file is part of MediaWiki, it is not a valid entry point\n" );
 }
 
-require_once( dirname(__FILE__) . '/../includes/cbt/CBTProcessor.php' );
-require_once( dirname(__FILE__) . '/../includes/cbt/CBTCompiler.php' );
-require_once( dirname(__FILE__) . '/../includes/SkinTemplate.php' );
-
+require_once( 'includes/cbt/CBTProcessor.php' );
+require_once( 'includes/cbt/CBTCompiler.php' );
+require_once( 'includes/SkinTemplate.php' );
 
 /**
  * MonoBook clone using the new dependency-tracking template processor.
@@ -437,6 +436,7 @@ class SkinMonoBookCBT extends SkinTemplate {
 				if ( $name == 'disable' ) {
 					continue;
 				}
+				$code = cbt_escape( $code );
 				$name = cbt_escape( $name );
 				$s .= "{ca_variant {{$code}} {{$name}} {{$vcount}} {{$etpl}}}\n";
 				$vcount ++;