Avoid duplicate require_once() under windows by using the autoloader

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 0f47f3c..5600ae3 100644 (file)
--- 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 c66947c..8c1b39e 100644 (file)
--- 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';