From: Demon <chadh@wikimedia.org>
Date: Sun, 11 Nov 2012 19:16:38 +0000 (+0000)
Subject: Merge changes I4ac3bc14,I470acb8b
X-Git-Tag: 1.31.0-rc.0~21664
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=8ab003840c9c0cdf0554f973ba797da31201ecf8;p=lhc%2Fweb%2Fwiklou.git

Merge changes I4ac3bc14,I470acb8b

* changes:
  make addPortletLink work with CologneBlue
  (bug 18338) WAI-ARIA landmark roles in most used skins
---

8ab003840c9c0cdf0554f973ba797da31201ecf8
diff --cc skins/Vector.php
index 227d18d80f,c30a1cd41a..104cdde034
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@@ -441,29 -441,13 +441,29 @@@ class VectorTemplate extends BaseTempla
  				break;
  				case 'PERSONAL':
  ?>
- <div id="p-personal" class="<?php if ( count( $this->data['personal_urls'] ) == 0 ) echo ' emptyPortlet'; ?>">
+ <div id="p-personal" role="navigation" class="<?php if ( count( $this->data['personal_urls'] ) == 0 ) echo ' emptyPortlet'; ?>">
  	<h5><?php $this->msg( 'personaltools' ) ?></h5>
  	<ul<?php $this->html( 'userlangattributes' ) ?>>
 -<?php			foreach( $this->getPersonalTools() as $key => $item ) { ?>
 -		<?php echo $this->makeListItem( $key, $item ); ?>
 -
 -<?php			} ?>
 +<?php
 +					$personalTools = $this->getPersonalTools();
 +					if ( $wgVectorCombineUserTalk && isset( $personalTools['userpage'] ) ) {
 +?>
 +		<li>
 +<?php
 +						echo $this->makeListItem( 'userpage', $personalTools['userpage'], array( 'tag' => 'span' ) );
 +?> <?php
 +						$personalTools['mytalk']['links'][0]['text'] = $this->getMsg( 'mytalk-parenthetical' )->text();
 +						$talkItem = $this->makeListItem( 'mytalk', $personalTools['mytalk'], array( 'tag' => 'span' ) );
 +						echo $this->getMsg( 'parentheses' )->rawParams( $talkItem )->escaped();
 +						unset( $personalTools['userpage'], $personalTools['mytalk'] );
 +?>
 +		</li>
 +<?php
 +					}
 +					foreach ( $personalTools as $key => $item ) {
 +						echo $this->makeListItem( $key, $item );
 +					}
 +?>
  	</ul>
  </div>
  <?php