From: Tim Starling <tstarling@users.mediawiki.org>
Date: Wed, 2 Aug 2006 17:33:18 +0000 (+0000)
Subject: Avoid duplicate require_once() under windows by using the autoloader
X-Git-Tag: 1.31.0-rc.0~56104
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=9315e023dc03d8f12ec8e7d95b1537e14045a596;p=lhc%2Fweb%2Fwiklou.git

Avoid duplicate require_once() under windows by using the autoloader
---

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 0f47f3ca38..5600ae3f79 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -222,6 +222,8 @@ function __autoload($className) {
 		'ZhClient' => 'includes/ZhClient.php',
 		'memcached' => 'includes/memcached-client.php',
 		'UtfNormal' => 'includes/normal/UtfNormal.php',
+		'UsercreateTemplate' => 'includes/templates/Userlogin.php',
+		'UserloginTemplate' => 'includes/templates/Userlogin.php',
 		'Language' => 'languages/Language.php',
 		'LanguageUtf8' => 'languages/LanguageUtf8.php',
 	);
diff --git a/includes/SpecialUserlogin.php b/includes/SpecialUserlogin.php
index c66947cc70..8c1b39ed79 100644
--- a/includes/SpecialUserlogin.php
+++ b/includes/SpecialUserlogin.php
@@ -518,9 +518,6 @@ class LoginForm {
 
 		$titleObj = Title::makeTitle( NS_SPECIAL, 'Userlogin' );
 
-		require_once( 'SkinTemplate.php' );
-		require_once( 'templates/Userlogin.php' );
-
 		if ( $this->mType == 'signup' ) {
 			$template = new UsercreateTemplate();
 			$q = 'action=submitlogin&type=signup';