From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Tue, 15 Apr 2008 16:18:08 +0000 (+0000)
Subject: * Pass directly the title object to OutputPage::returnToMain() so it doesn't need... 
X-Git-Tag: 1.31.0-rc.0~48305
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=b9de0846fd4e931e0d3171092ec4818ebabe5aae;p=lhc%2Fweb%2Fwiklou.git

* Pass directly the title object to OutputPage::returnToMain() so it doesn't need to be created there
* Added UserArrayFromResult class to AutoLoader, CentralAuth was throwing an error because it couldn't find that class
---

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 1215b6081c..3d43865c7e 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -267,6 +267,7 @@ function __autoload($className) {
 		'UploadFormMogile' => 'includes/SpecialUploadMogile.php',
 		'User' => 'includes/User.php',
 		'UserArray' => 'includes/UserArray.php',
+		'UserArrayFromResult' => 'includes/UserArray.php',
 		'UserMailer' => 'includes/UserMailer.php',
 		'UserrightsPage' => 'includes/SpecialUserrights.php',
 		'UserRightsProxy' => 'includes/UserRightsProxy.php',
diff --git a/includes/SpecialConfirmemail.php b/includes/SpecialConfirmemail.php
index d26876a2f1..91d41f5eb5 100644
--- a/includes/SpecialConfirmemail.php
+++ b/includes/SpecialConfirmemail.php
@@ -90,7 +90,7 @@ class EmailConfirmation extends UnlistedSpecialPage {
 			$wgOut->addWikiMsg( $message );
 			if( !$wgUser->isLoggedIn() ) {
 				$title = SpecialPage::getTitleFor( 'Userlogin' );
-				$wgOut->returnToMain( true, $title->getPrefixedText() );
+				$wgOut->returnToMain( true, $title );
 			}
 		} else {
 			$wgOut->addWikiMsg( 'confirmemail_invalid' );