From da9db7e8c8c8ab49006701437f8ed548c50b6c88 Mon Sep 17 00:00:00 2001
From: MatmaRex <matma.rex@gmail.com>
Date: Thu, 27 Sep 2012 19:01:49 +0200
Subject: [PATCH] CologneBlue rewrite: don't display login/out links in sidebar

They do not belong to "My pages".

Instead, display them properly in syslinks, respecting
$wgUseCombinedLoginLink and creating them via usual means.

Change-Id: I8e2cc25e41e46a471b98e0d18336c753b8645d0e
---
 skins/CologneBlue.php | 38 ++++++++++++++++----------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index b172fd2d50..5844a477a3 100644
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -549,16 +549,8 @@ class CologneBlueTemplate extends BaseTemplate {
 	 * @return string
 	 */
 	function sysLinks() {
-		$li = SpecialPage::getTitleFor( 'Userlogin' );
-		$lo = SpecialPage::getTitleFor( 'Userlogout' );
-
-		$rt = $this->getSkin()->getTitle()->getPrefixedURL();
-		if ( 0 == strcasecmp( urlencode( $lo ), $rt ) ) {
-			$q = array();
-		} else {
-			$q = array( 'returnto' => $rt );
-		}
-
+		$personalUrls = $this->data['personal_urls'];
+		
 		$s = array(
 			$this->getSkin()->mainPageLink(),
 			Linker::linkKnown(
@@ -584,19 +576,17 @@ class CologneBlueTemplate extends BaseTemplate {
 			$s[] = $this->extensionTabLinks();
 		}
 		if ( $this->data['loggedin'] ) {
-			$s[] = Linker::linkKnown(
-				$lo,
-				wfMessage( 'logout' )->text(),
-				array(),
-				$q
-			);
+			$s[] = $this->makeLink( 'logout', $personalUrls['logout'] );
 		} else {
-			$s[] = Linker::linkKnown(
-				$li,
-				wfMessage( 'login' )->text(),
-				array(),
-				$q
-			);
+			if ( $personalUrls['createaccount'] ) { // Controlled by $wgUseCombinedLoginLink
+				$s[] = $this->makeLink( 'createaccount', $personalUrls['createaccount'] );
+			}
+			if ( $personalUrls['login'] ) {
+				$s[] = $this->makeLink( 'login', $personalUrls['login'] );
+			}
+			if ( $personalUrls['anonlogin'] ) {
+				$s[] = $this->makeLink( 'anonlogin', $personalUrls['anonlogin'] );
+			}
 		}
 
 		return $this->getSkin()->getLanguage()->pipeList( $s );
@@ -676,6 +666,10 @@ class CologneBlueTemplate extends BaseTemplate {
 					
 					// Personal tools ("My pages")
 					$bar['qbmyoptions'] = $this->getPersonalTools();
+					$bar['qbmyoptions']['login'] = false;
+					$bar['qbmyoptions']['anonlogin'] = false;
+					$bar['qbmyoptions']['logout'] = false;
+					$bar['qbmyoptions']['createaccount'] = false;
 					
 					$additions_done = true;
 				}
-- 
2.20.1