From 4999ee2dbfa97692843e207bdb35a0f1d4695e5d Mon Sep 17 00:00:00 2001
From: Alexandre Emsenhuber <ialex.wiki@gmail.com>
Date: Wed, 21 Nov 2012 15:26:15 +0100
Subject: [PATCH] Follow-up I087c2729 (750936f): factorise common code

Change-Id: I6d06ee4df857a90517bf0d4b3a40cd7ba9842968
---
 includes/specials/SpecialUserlogin.php | 33 ++++++++------------------
 1 file changed, 10 insertions(+), 23 deletions(-)

diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index c76047cb7b..23c9eb5c93 100644
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -897,7 +897,8 @@ class LoginForm extends SpecialPage {
 		wfRunHooks( 'UserLoginComplete', array( &$currentUser, &$injected_html ) );
 
 		if( $injected_html !== '' ) {
-			$this->displaySuccessfulLogin( 'loginsuccess', $injected_html );
+			$this->displaySuccessfulAction( $this->msg( 'loginsuccesstitle' ),
+				'loginsuccess', $injected_html );
 		} else {
 			$this->executeReturnTo( 'successredirect' );
 		}
@@ -924,35 +925,21 @@ class LoginForm extends SpecialPage {
 		 */
 		wfRunHooks( 'BeforeWelcomeCreation', array( &$welcome_creation_msg, &$injected_html ) );
 
-		$this->displaySuccessfulAccountCreation( $welcome_creation_msg, $injected_html );
+		$this->displaySuccessfulAction( $this->msg( 'welcomeuser', $this->getUser()->getName() ),
+			$welcome_creation_msg, $injected_html );
 	}
 
 	/**
-	 * Display an "account creation successful" page.
-	 * @param $msgname string
-	 * @param $injected_html string
-	 */
-	private function displaySuccessfulAccountCreation( $msgname, $injected_html ) {
-		$out = $this->getOutput();
-		$out->setPageTitle( $this->msg( 'welcomeuser', $this->getUser()) );
-		if( $msgname ){
-			$out->addWikiMsg( $msgname, wfEscapeWikiText( $this->getUser()->getName() ) );
-		}
-
-		$out->addHTML( $injected_html );
-
-		$this->executeReturnTo( 'success' );
-	}
-
-	/**
-	 * Display a "login successful" page.
+	 * Display an "successful action" page.
+	 *
+	 * @param $title string|Message page's title
 	 * @param $msgname string
 	 * @param $injected_html string
 	 */
-	private function displaySuccessfulLogin( $msgname, $injected_html ) {
+	private function displaySuccessfulAction( $title, $msgname, $injected_html ) {
 		$out = $this->getOutput();
-		$out->setPageTitle( $this->msg( 'loginsuccesstitle' ) );
-		if( $msgname ){
+		$out->setPageTitle( $title );
+		if ( $msgname ) {
 			$out->addWikiMsg( $msgname, wfEscapeWikiText( $this->getUser()->getName() ) );
 		}
 
-- 
2.20.1