From 61ad0b02e312a53155094e16a59aaaf432c2dceb Mon Sep 17 00:00:00 2001
From: Daniel Friesen <pub-github@nadir-seen-fire.com>
Date: Wed, 15 Aug 2012 13:56:23 -0700
Subject: [PATCH] Fix separated login link so that create account and login are
 always next to each other.

Change-Id: Iea0b325f66987a3a2de2c0935998e75f834d5786
---
 includes/SkinTemplate.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 92df4a3403..816a416d3b 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -628,6 +628,7 @@ class SkinTemplate extends Skin {
 			global $wgSecureLogin;
 			$proto = $wgSecureLogin ? PROTO_HTTPS : null;
 
+			$login_id = $this->showIPinHeader() ? 'anonlogin' : 'login';
 			$login_url = array(
 				'text' => $this->msg( $loginlink )->text(),
 				'href' => self::makeSpecialUrl( 'Userlogin', $returnto, $proto ),
@@ -641,10 +642,6 @@ class SkinTemplate extends Skin {
 				'class' => $wgSecureLogin ? 'link-https' : ''
 			);
 
-			if ( $this->getUser()->isAllowed( 'createaccount' ) && !$useCombinedLoginLink ) {
-				$personal_urls['createaccount'] = $createaccount_url;
-			}
-
 			if( $this->showIPinHeader() ) {
 				$href = &$this->userpageUrlDetails['href'];
 				$personal_urls['anonuserpage'] = array(
@@ -661,10 +658,13 @@ class SkinTemplate extends Skin {
 					'class' => $usertalkUrlDetails['exists'] ? false : 'new',
 					'active' => ( $pageurl == $href )
 				);
-				$personal_urls['anonlogin'] = $login_url;
-			} else {
-				$personal_urls['login'] = $login_url;
 			}
+
+			if ( $this->getUser()->isAllowed( 'createaccount' ) && !$useCombinedLoginLink ) {
+				$personal_urls['createaccount'] = $createaccount_url;
+			}
+
+			$personal_urls[$login_id] = $login_url;
 		}
 
 		wfRunHooks( 'PersonalUrls', array( &$personal_urls, &$title ) );
-- 
2.20.1