From: MatmaRex <matma.rex@gmail.com>
Date: Wed, 26 Sep 2012 19:12:35 +0000 (+0200)
Subject: CologneBlue rewrite: remove stuff from pageTitleLinks() that doesn't belong in there
X-Git-Tag: 1.31.0-rc.0~22159^2
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=e48fa8c697d65bcb703da7342e699c3a363efa45;p=lhc%2Fweb%2Fwiklou.git

CologneBlue rewrite: remove stuff from pageTitleLinks() that doesn't belong in there

Change-Id: I2d0b12350e1e096d278733db449e51f79b855717
---

diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index 4e7459acd6..7b3202212a 100644
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -184,56 +184,6 @@ class CologneBlueTemplate extends BaseTemplate {
 			$s[] = $privacy;
 		}
 
-		if ( $wgOut->isArticleRelated() ) {
-			if ( $title->getNamespace() == NS_FILE ) {
-				$image = wfFindFile( $title );
-
-				if ( $image ) {
-					$href = $image->getURL();
-					$s[] = Html::element( 'a', array( 'href' => $href,
-						'title' => $href ), $title->getText() );
-
-				}
-			}
-		}
-
-		if ( 'history' == $action || isset( $diff ) || isset( $oldid ) ) {
-			$s[] .= Linker::linkKnown(
-				$title,
-				wfMessage( 'currentrev' )->text()
-			);
-		}
-
-		if ( $wgUser->getNewtalk() ) {
-			# do not show "You have new messages" text when we are viewing our
-			# own talk page
-			if ( !$title->equals( $wgUser->getTalkPage() ) ) {
-				$tl = Linker::linkKnown(
-					$wgUser->getTalkPage(),
-					wfMessage( 'newmessageslink' )->escaped(),
-					array(),
-					array( 'redirect' => 'no' )
-				);
-
-				$dl = Linker::linkKnown(
-					$wgUser->getTalkPage(),
-					wfMessage( 'newmessagesdifflink' )->escaped(),
-					array(),
-					array( 'diff' => 'cur' )
-				);
-				$s[] = '<strong>' . wfMessage( 'youhavenewmessages', $tl, $dl )->text() . '</strong>';
-				# disable caching
-				$wgOut->setSquidMaxage( 0 );
-				$wgOut->enableClientCache( false );
-			}
-		}
-
-		$undelete = $skin->getUndeleteLink();
-
-		if ( !empty( $undelete ) ) {
-			$s[] = $undelete;
-		}
-
 		return $wgLang->pipeList( $s );
 	}
 
@@ -611,6 +561,9 @@ class CologneBlueTemplate extends BaseTemplate {
 		<div id="langlinks"><?php echo str_replace( '<br />', '', $this->otherLanguages() ) ?></div>
 		<?php echo $this->getSkin()->getCategories() ?>
 		<div id="titlelinks"><?php echo $this->pageTitleLinks() ?></div>
+		<?php if ( $this->data['newtalk'] ) { ?>
+		<div class="usermessage"><strong><?php echo $this->data['newtalk'] ?></strong></div>
+		<?php } ?>
 	</div>
 </div>
 <?php