From: Catrope <roan.kattouw@gmail.com>
Date: Fri, 15 Jun 2012 01:41:33 +0000 (-0700)
Subject: Put skin classes in the Autoloader
X-Git-Tag: 1.31.0-rc.0~23284^2
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=e685dbf6259d4375755a5ca3f65a8a3edf449a85;p=lhc%2Fweb%2Fwiklou.git

Put skin classes in the Autoloader

Also remove require_once() calls from skin files.

This fixes a bug introduced in 0ec77e2b31 where MySkin would throw a
fatal error because it couldn't find the MonoBookTemplate class.

Change-Id: I63bbe1d25e8cb70ee4baf99ec6e685444b663c1f
---

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index d29c4e35b6..d9291041c4 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -1015,6 +1015,23 @@ $wgAutoloadLocalClasses = array(
 	'SeleniumTestListener' => 'tests/selenium/SeleniumTestListener.php',
 	'SeleniumTestSuite' => 'tests/selenium/SeleniumTestSuite.php',
 	'SeleniumConfig' => 'tests/selenium/SeleniumConfig.php',
+
+	# skins
+	'CologneBlueTemplate' => 'skins/CologneBlue.php',
+	'ModernTemplate' => 'skins/Modern.php',
+	'MonoBookTemplate' => 'skins/MonoBook.php',
+	'NostalgiaTemplate' => 'skins/Nostalgia.php',
+	'SkinChick' => 'skins/Chick.php',
+	'SkinCologneBlue' => 'skins/CologneBlue.php',
+	'SkinModern' => 'skins/Modern.php',
+	'SkinMonoBook' => 'skins/MonoBook.php',
+	'SkinMySkin' => 'skins/MySkin.php',
+	'SkinNostalgia' => 'skins/Nostalgia.php',
+	'SkinSimple' => 'skins/Simple.php',
+	'SkinStandard' => 'skins/Standard.php',
+	'SkinVector' => 'skins/Vector.php',
+	'StandardTemplate' => 'skins/Standard.php',
+	'VectorTemplate' => 'skins/Vector.php',
 );
 
 class AutoLoader {
diff --git a/skins/Chick.php b/skins/Chick.php
index 8416393fbf..54dada3de7 100644
--- a/skins/Chick.php
+++ b/skins/Chick.php
@@ -25,9 +25,6 @@
 if( !defined( 'MEDIAWIKI' ) )
 	die( -1 );
 
-/** */
-require_once( dirname(__FILE__) . '/MonoBook.php' );
-
 /**
  * Inherit main code from SkinTemplate, set the CSS and template filter.
  * @ingroup Skins
diff --git a/skins/Modern.php b/skins/Modern.php
index efcf1dea42..1656524482 100644
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -25,8 +25,6 @@
 if( !defined( 'MEDIAWIKI' ) )
 	die( -1 );
 
-require( dirname(__FILE__) . '/MonoBook.php' );
-
 /**
  * Inherit main code from SkinTemplate, set the CSS and template filter.
  * @todo document